Raincloud/sheepit-shadow-nabber
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ref: simplify getInstance, do not put context on a singleton

Browse Source
This commit is contained in:
Sheepit Renderfarm
2024-11-20 23:13:00 +00:00
parent ac7572d0b0
commit 844d8b7f99
10 changed files with 32 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/sheepit/client/Client.java
View File

@@ -94,7 +94,7 @@ import okhttp3.HttpUrl;
public Client(Gui gui, Configuration configuration, String url) { public Client(Gui gui, Configuration configuration, String url) {
this.configuration = configuration; this.configuration = configuration;
this.server = new Server(url, this.configuration, this); this.server = new Server(url, this.configuration, this);
this.log = Log.getInstance(this.configuration); this.log = Log.getInstance();
this.gui = gui; this.gui = gui;
this.directoryManager = new DirectoryManager(this.configuration); this.directoryManager = new DirectoryManager(this.configuration);
this.renderingJob = null; this.renderingJob = null;

6
src/main/java/com/sheepit/client/DirectoryManager.java
View File

@@ -72,19 +72,19 @@ public class DirectoryManager {
Files.deleteIfExists(targetArchivePath); // createLink only works if the target does not exist Files.deleteIfExists(targetArchivePath); // createLink only works if the target does not exist
try { try {
Files.createLink(targetArchivePath, existingArchivePath); Files.createLink(targetArchivePath, existingArchivePath);
Log.getInstance(configuration).debug("Created hardlink from " + targetArchivePath + " to " + existingArchivePath); Log.getInstance().debug("Created hardlink from " + targetArchivePath + " to " + existingArchivePath);
} }
catch (UnsupportedOperationException // underlying file system does not support hard-linking catch (UnsupportedOperationException // underlying file system does not support hard-linking
| FileSystemException // cache-dir and shared-zip are on separate file systems, even though hard-linking is supported | FileSystemException // cache-dir and shared-zip are on separate file systems, even though hard-linking is supported
| SecurityException // user is not allowed to create hard-links | SecurityException // user is not allowed to create hard-links
ignore) { ignore) {
// Creating hardlinks might not be supported on some filesystems // Creating hardlinks might not be supported on some filesystems
Log.getInstance(configuration).debug("Failed to create hardlink, falling back to copying file to " + targetArchivePath); Log.getInstance().debug("Failed to create hardlink, falling back to copying file to " + targetArchivePath);
Files.copy(existingArchivePath, targetArchivePath, StandardCopyOption.REPLACE_EXISTING); Files.copy(existingArchivePath, targetArchivePath, StandardCopyOption.REPLACE_EXISTING);
} }
} }
catch (IOException e) { catch (IOException e) {
Log.getInstance(configuration).error("Error while copying " + source + " from shared downloads directory to working dir"); Log.getInstance().error("Error while copying " + source + " from shared downloads directory to working dir");
return false; return false;
} }

29
src/main/java/com/sheepit/client/Log.java
View File

@@ -19,6 +19,8 @@
package com.sheepit.client; package com.sheepit.client;
import lombok.Getter;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.io.RandomAccessFile; import java.io.RandomAccessFile;
@@ -43,7 +45,7 @@ public final class Log {
public final int MAX_SIZE = 10000000; // in B public final int MAX_SIZE = 10000000; // in B
public final int PERIOD = 3600000; // duration in ms between two shrink public final int PERIOD = 3600000; // duration in ms between two shrink
private static Log instance = null; @Getter private static Log instance = null;
private Map<Integer, List<String>> checkpoints = new HashMap<>(); private Map<Integer, List<String>> checkpoints = new HashMap<>();
private int lastCheckPoint; private int lastCheckPoint;
@@ -170,24 +172,21 @@ public final class Log {
} }
} }
public static synchronized Log getInstance(Configuration config) { public static synchronized void setInstance(Configuration config) {
if (instance == null) { String path = null;
String path = null; boolean print = false;
boolean print = false; boolean debug = false;
boolean debug = false; if (config != null) {
if (config != null) { debug = config.isDebugLevel();
debug = config.isDebugLevel(); print = config.isPrintLog();
print = config.isPrintLog(); path = config.getLogDirectory() == null ? null : config.getLogDirectory();
path = config.getLogDirectory() == null ? null : config.getLogDirectory();
}
instance = new Log(debug, print, path);
} }
return instance;
instance = new Log(debug, print, path);
} }
public static synchronized void printCheckPoint(int point_) { public static synchronized void printCheckPoint(int point_) {
Log log = getInstance(null); Log log = getInstance();
Optional<List<String>> logs = log.getForCheckPoint(point_); Optional<List<String>> logs = log.getForCheckPoint(point_);
if (logs.isPresent()) { if (logs.isPresent()) {
for (String alog : logs.get()) { for (String alog : logs.get()) {

2
src/main/java/com/sheepit/client/Server.java
View File

@@ -107,7 +107,7 @@ public class Server extends Thread {
this.base_url = url_; this.base_url = url_;
this.user_config = user_config_; this.user_config = user_config_;
this.client = client_; this.client = client_;
this.log = Log.getInstance(this.user_config); this.log = Log.getInstance();
this.directoryManager = new DirectoryManager(this.user_config); this.directoryManager = new DirectoryManager(this.user_config);
this.lastRequestTime = 0; this.lastRequestTime = 0;
this.keepmealive_duration = 15 * 60 * 1000; // default 15min this.keepmealive_duration = 15 * 60 * 1000; // default 15min

2
src/main/java/com/sheepit/client/hardware/cpu/CPU.java
View File

@@ -42,7 +42,7 @@ import java.io.InputStreamReader;
* The detail is limited to only if it's 32 or 64bit * The detail is limited to only if it's 32 or 64bit
*/ */
private final String arch = detectArch(); private final String arch = detectArch();
private static final Log log = Log.getInstance(null); private static final Log log = Log.getInstance();
private static Integer logicalCores = -1; // Store core count throughout instances private static Integer logicalCores = -1; // Store core count throughout instances

4
src/main/java/com/sheepit/client/os/Linux.java
View File

@@ -81,7 +81,7 @@ public class Linux extends OS {
actual_command.add(0, NICE_BINARY_PATH); actual_command.add(0, NICE_BINARY_PATH);
} }
else { else {
Log.getInstance(null).error("No low priority binary, will not launch renderer in normal priority"); Log.getInstance().error("No low priority binary, will not launch renderer in normal priority");
} }
ProcessBuilder builder = new ProcessBuilder(actual_command); ProcessBuilder builder = new ProcessBuilder(actual_command);
@@ -141,7 +141,7 @@ public class Linux extends OS {
hasNiceBinary = true; hasNiceBinary = true;
} }
catch (IOException e) { catch (IOException e) {
Log.getInstance(null).error("Failed to find low priority binary, will not launch renderer in normal priority (" + e + ")"); Log.getInstance().error("Failed to find low priority binary, will not launch renderer in normal priority (" + e + ")");
} }
finally { finally {
if (process != null) { if (process != null) {

4
src/main/java/com/sheepit/client/os/Mac.java
View File

@@ -54,7 +54,7 @@ public class Mac extends OS {
actual_command.add(0, NICE_BINARY_PATH); actual_command.add(0, NICE_BINARY_PATH);
} }
else { else {
Log.getInstance(null).error("No low priority binary, will not launch renderer in normal priority"); Log.getInstance().error("No low priority binary, will not launch renderer in normal priority");
} }
ProcessBuilder builder = new ProcessBuilder(actual_command); ProcessBuilder builder = new ProcessBuilder(actual_command);
builder.redirectErrorStream(true); builder.redirectErrorStream(true);
@@ -111,7 +111,7 @@ public class Mac extends OS {
hasNiceBinary = true; hasNiceBinary = true;
} }
catch (IOException e) { catch (IOException e) {
Log.getInstance(null).error("Failed to find low priority binary, will not launch renderer in normal priority (" + e + ")"); Log.getInstance().error("Failed to find low priority binary, will not launch renderer in normal priority (" + e + ")");
} }
finally { finally {
if (process != null) { if (process != null) {

2
src/main/java/com/sheepit/client/standalone/GuiText.java
View File

@@ -53,7 +53,7 @@ public class GuiText implements Gui {
public GuiText() { public GuiText() {
this.downloadProgress = new DownloadProgress(this); this.downloadProgress = new DownloadProgress(this);
this.framesRendered = 0; this.framesRendered = 0;
this.log = Log.getInstance(null); this.log = Log.getInstance();
this.df = new SimpleDateFormat("MMM dd HH:mm:ss"); this.df = new SimpleDateFormat("MMM dd HH:mm:ss");
this.eta = ""; this.eta = "";
this.statusOld = ""; this.statusOld = "";

12
src/main/java/com/sheepit/client/standalone/Worker.java
View File

@@ -152,8 +152,8 @@ public class Worker {
if (sharedDownloadsDir != null) { if (sharedDownloadsDir != null) {
File dir = new File(sharedDownloadsDir); File dir = new File(sharedDownloadsDir);
if (dir.exists() == false && dir.mkdirs()) { if (dir.exists() == false && dir.mkdirs() == false) {
Log.getInstance(config).debug("created shared-zip directory " + dir); System.err.println("ERROR: Failed to create shared-zip directory " + dir);
} }
else if (dir.exists() == false) { else if (dir.exists() == false) {
System.err.println("ERROR: The shared-zip directory " + dir + " does not exist and cannot be automatically created"); System.err.println("ERROR: The shared-zip directory " + dir + " does not exist and cannot be automatically created");
@@ -176,10 +176,7 @@ public class Worker {
File a_dir = new File(cache_dir); File a_dir = new File(cache_dir);
a_dir.mkdirs(); a_dir.mkdirs();
if (a_dir.isDirectory() && a_dir.canWrite()) { if (a_dir.isDirectory() && a_dir.canWrite()) {
DirectoryManager directoryManager = new DirectoryManager(config);
config.setCacheDir(a_dir); config.setCacheDir(a_dir);
directoryManager.createCacheDir();
} }
else { else {
System.err.println("ERROR: The entered cache path is either not a directory or is not writable!"); System.err.println("ERROR: The entered cache path is either not a directory or is not writable!");
@@ -474,7 +471,10 @@ public class Worker {
String configFilePath = config.getConfigFilePath() != null ? config.getConfigFilePath() : OS.getOS().getDefaultConfigFilePath(); String configFilePath = config.getConfigFilePath() != null ? config.getConfigFilePath() : OS.getOS().getDefaultConfigFilePath();
config.setLogDirectory(log_dir != null ? log_dir : (new File (configFilePath).getParent())); config.setLogDirectory(log_dir != null ? log_dir : (new File (configFilePath).getParent()));
Log.getInstance(config).debug("client version " + Configuration.jarVersion); (new DirectoryManager(config)).createCacheDir();
Log.setInstance(config);
Log.getInstance().debug("client version " + Configuration.jarVersion);
// Hostname change will overwrite the existing one (default or read from configuration file) but changes will be lost when the client closes // Hostname change will overwrite the existing one (default or read from configuration file) but changes will be lost when the client closes
if (hostname != null) { if (hostname != null) {

2
src/main/java/com/sheepit/client/standalone/swing/activity/Working.java
View File

@@ -111,7 +111,7 @@ public class Working implements Activity {
sessionUploadsStatsValue = new JLabel("0KB"); sessionUploadsStatsValue = new JLabel("0KB");
currentTheme = UIManager.getLookAndFeel().getName(); // Capture the theme on component instantiation currentTheme = UIManager.getLookAndFeel().getName(); // Capture the theme on component instantiation
previousStatus = ""; previousStatus = "";
log = Log.getInstance(parent_.getConfiguration()); log = Log.getInstance();
//Overwrite the window close button behaviour to showa dialogue //Overwrite the window close button behaviour to showa dialogue
parent.setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE); parent.setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);