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

Merge branch 'feat/debug-vs-stdout' into 'master'

Browse Source 
Fix: debug level and log on stdout are not the same

See merge request sheepitrenderfarm/client!302
This commit is contained in:
Laurent Clouet
2024-05-05 10:55:46 +00:00
parent e21928ba1b 96cca24990
commit 788158cad0
5 changed files with 39 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -78,7 +78,9 @@ public class Worker {
@Option(name = SettingsLoader.ARG_RENDERTIME, usage = "Maximum time allow for each frame (in minutes)", required = false) private int max_rendertime = -1;
@Option(name = SettingsLoader.ARG_VERBOSE, usage = "Display full log", required = false) private boolean print_log = false;
@Option(name = SettingsLoader.ARG_LOG_STDOUT, usage = "Display full log", required = false) private boolean print_log = false;
@Option(name = SettingsLoader.ARG_VERBOSE, usage = "Log DEBUG", required = false) private boolean log_debug = false;
@Option(name = SettingsLoader.ARG_REQUEST_TIME, usage = "H1:M1-H2:M2,H3:M3-H4:M4 Use the 24h format. For example to request job between 2am-8.30am and 5pm-11pm you should do -request-time 2:00-8:30,17:00-23:00 Caution, it's the requesting job time to get a project, not the working time", metaVar = "2:00-8:30,17:00-23:00", required = false) private String request_time = null;
@@ -138,6 +140,7 @@ public class Worker {
ComputeType compute_method = null;
Configuration config = new Configuration(null, login, password);
config.setDebugLevel(log_debug);
config.setPrintLog(print_log);
config.setPriority(priority);
config.setDetectGPUs(!no_gpu_detection);

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

@@ -800,7 +800,7 @@ public class Settings implements Activity {
.setSettings(config.getConfigFilePath(), login.getText(), new String(password.getPassword()), proxyText, hostnameText, method,
selected_gpu, cpu_cores, max_ram, max_rendertime, getCachePath(config), getSharedPath(config), autoSignIn.isSelected(),
useSysTray.isSelected(), headlessCheckbox.isSelected(), GuiSwing.type, themeOptionsGroup.getSelection().getActionCommand(),
config.getPriority(), disableLargeDownloads.isSelected());
config.getPriority(), disableLargeDownloads.isSelected(), config.isDebugLevel());
// wait for successful authentication (to store the public key)
// or do we already have one?