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

Merge branch 'fix/stdout' into 'master'

Browse Source 
Fix: use logger instead of print on stdout

See merge request sheepitrenderfarm/client!348
This commit is contained in:
Sheepit Renderfarm
2024-12-14 09:39:28 +00:00
parent 943b194c39 d3aa9c0835
commit 2e10f7379d
6 changed files with 37 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -756,7 +756,7 @@ import static com.sheepit.client.RenderSettings.UPDATE_METHOD_BY_TILE;
} }
} }
catch (NumberFormatException e) { catch (NumberFormatException e) {
System.out.println("Exception 94: " + e); log.error("Exception 94: " + e);
} }
} }
} }

9
src/main/java/com/sheepit/client/hardware/gpu/hip/HIP.java
View File

@@ -1,5 +1,6 @@
package com.sheepit.client.hardware.gpu.hip; package com.sheepit.client.hardware.gpu.hip;
import com.sheepit.client.Log;
import com.sheepit.client.hardware.gpu.hip.data.HipError_t; import com.sheepit.client.hardware.gpu.hip.data.HipError_t;
import com.sheepit.client.os.OS; import com.sheepit.client.os.OS;
import com.sheepit.client.os.Windows; import com.sheepit.client.os.Windows;
@@ -18,7 +19,7 @@ public class HIP {
IntByReference deviceCount = new IntByReference(); IntByReference deviceCount = new IntByReference();
int status = hipLib.hipGetDeviceCount(deviceCount); int status = hipLib.hipGetDeviceCount(deviceCount);
if (status != HipError_t.HIP_SUCCESS) { if (status != HipError_t.HIP_SUCCESS) {
System.err.println("Error"); Log.getInstance().error("HIP::getNumberOfDevices Error status: " + status);
return -1; return -1;
} }
return deviceCount.getValue(); return deviceCount.getValue();
@@ -40,13 +41,13 @@ public class HIP {
HIP_DEVICES_CACHED = getNumberOfDevices(hip); HIP_DEVICES_CACHED = getNumberOfDevices(hip);
} }
catch (UnsatisfiedLinkError e) { catch (UnsatisfiedLinkError e) {
System.out.println("HIP::getGpus failed(A) to load HIP lib (path: " + HIP_LIBRARY + ")"); Log.getInstance().error("HIP::getGpus failed(A) to load HIP lib (path: " + HIP_LIBRARY + ")");
} }
catch (ExceptionInInitializerError e) { catch (ExceptionInInitializerError e) {
System.out.println("HIP::getGpus failed(B) ExceptionInInitializerError " + e); Log.getInstance().error("HIP::getGpus failed(B) ExceptionInInitializerError " + e);
} }
catch (Exception e) { catch (Exception e) {
System.out.println("HIP::getGpus failed(C) generic exception " + e); Log.getInstance().error("HIP::getGpus failed(C) generic exception " + e);
} }
if (HIP_DEVICES_CACHED < 0) { if (HIP_DEVICES_CACHED < 0) {
HIP_DEVICES_CACHED = 0; HIP_DEVICES_CACHED = 0;

37
src/main/java/com/sheepit/client/hardware/gpu/nvidia/Nvidia.java
View File

@@ -5,6 +5,7 @@ import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import com.sheepit.client.Log;
import com.sheepit.client.hardware.gpu.GPUDevice; import com.sheepit.client.hardware.gpu.GPUDevice;
import com.sheepit.client.hardware.gpu.GPULister; import com.sheepit.client.hardware.gpu.GPULister;
import com.sheepit.client.os.OS; import com.sheepit.client.os.OS;
@@ -172,21 +173,21 @@ public class Nvidia implements GPULister {
return null; return null;
} }
catch (ExceptionInInitializerError e) { catch (ExceptionInInitializerError e) {
System.out.println("Nvidia::getGpus ExceptionInInitializerError " + e); Log.getInstance().error("Nvidia::getGpus ExceptionInInitializerError " + e);
return null; return null;
} }
catch (Exception e) { catch (Exception e) {
System.out.println("Nvidia::getGpus generic exception " + e); Log.getInstance().error("Nvidia::getGpus generic exception " + e);
return null; return null;
} }
int result = cudalib.cuInit(0); int result = cudalib.cuInit(0);
if (result != CUresult.CUDA_SUCCESS) { if (result != CUresult.CUDA_SUCCESS) {
System.out.println("Nvidia::getGpus cuInit failed: " + getCudaErrorString(result) + " (" + result + ")"); Log.getInstance().error("Nvidia::getGpus cuInit failed: " + getCudaErrorString(result) + " (" + result + ")");
if (result == CUresult.CUDA_ERROR_UNKNOWN) { if (result == CUresult.CUDA_ERROR_UNKNOWN) {
System.out.println("If you are running Linux, this error is usually due to nvidia kernel module 'nvidia_uvm' not loaded."); Log.getInstance().error("If you are running Linux, this error is usually due to nvidia kernel module 'nvidia_uvm' not loaded.");
System.out.println("Relaunch the application as root or load the module."); Log.getInstance().error("Relaunch the application as root or load the module.");
System.out.println("Most of time it does fix the issue."); Log.getInstance().error("Most of time it does fix the issue.");
} }
return null; return null;
} }
@@ -199,7 +200,7 @@ public class Nvidia implements GPULister {
result = cudalib.cuDeviceGetCount(count); result = cudalib.cuDeviceGetCount(count);
if (result != CUresult.CUDA_SUCCESS) { if (result != CUresult.CUDA_SUCCESS) {
System.out.println("Nvidia::getGpus cuDeviceGetCount failed (ret: " + CUresult.stringFor(result) + ")"); Log.getInstance().error("Nvidia::getGpus cuDeviceGetCount failed (ret: " + CUresult.stringFor(result) + ")");
return null; return null;
} }
@@ -210,14 +211,14 @@ public class Nvidia implements GPULister {
result = cudalib.cuDeviceGet(aDevice, num); result = cudalib.cuDeviceGet(aDevice, num);
if (result != CUresult.CUDA_SUCCESS) { if (result != CUresult.CUDA_SUCCESS) {
System.out.println("Nvidia::getGpus cuDeviceGet failed (ret: " + CUresult.stringFor(result) + ")"); Log.getInstance().error("Nvidia::getGpus cuDeviceGet failed (ret: " + CUresult.stringFor(result) + ")");
continue; continue;
} }
IntByReference computeCapabilityMajor = new IntByReference(); IntByReference computeCapabilityMajor = new IntByReference();
result = cudalib.cuDeviceGetAttribute(computeCapabilityMajor, CUDeviceAttribute.CU_DEVICE_ATTRIBUTE_COMPUTE_CAPABILITY_MAJOR, aDevice.getValue()); result = cudalib.cuDeviceGetAttribute(computeCapabilityMajor, CUDeviceAttribute.CU_DEVICE_ATTRIBUTE_COMPUTE_CAPABILITY_MAJOR, aDevice.getValue());
if (result != CUresult.CUDA_SUCCESS) { if (result != CUresult.CUDA_SUCCESS) {
System.out.println("Nvidia::getGpus cuDeviceGetAttribute for CU_DEVICE_ATTRIBUTE_COMPUTE_CAPABILITY_MAJOR failed (ret: " + CUresult.stringFor(result) + ")"); Log.getInstance().error("Nvidia::getGpus cuDeviceGetAttribute for CU_DEVICE_ATTRIBUTE_COMPUTE_CAPABILITY_MAJOR failed (ret: " + CUresult.stringFor(result) + ")");
continue; continue;
} }
@@ -231,17 +232,17 @@ public class Nvidia implements GPULister {
IntByReference pciDeviceId = new IntByReference(); IntByReference pciDeviceId = new IntByReference();
result = cudalib.cuDeviceGetAttribute(pciDomainId, CUDeviceAttribute.CU_DEVICE_ATTRIBUTE_PCI_DOMAIN_ID, aDevice.getValue()); result = cudalib.cuDeviceGetAttribute(pciDomainId, CUDeviceAttribute.CU_DEVICE_ATTRIBUTE_PCI_DOMAIN_ID, aDevice.getValue());
if (result != CUresult.CUDA_SUCCESS) { if (result != CUresult.CUDA_SUCCESS) {
System.out.println("Nvidia::getGpus cuDeviceGetAttribute for CU_DEVICE_ATTRIBUTE_PCI_DOMAIN_ID failed (ret: " + CUresult.stringFor(result) + ")"); Log.getInstance().error("Nvidia::getGpus cuDeviceGetAttribute for CU_DEVICE_ATTRIBUTE_PCI_DOMAIN_ID failed (ret: " + CUresult.stringFor(result) + ")");
continue; continue;
} }
result = cudalib.cuDeviceGetAttribute(pciBusId, CUDeviceAttribute.CU_DEVICE_ATTRIBUTE_PCI_BUS_ID, aDevice.getValue()); result = cudalib.cuDeviceGetAttribute(pciBusId, CUDeviceAttribute.CU_DEVICE_ATTRIBUTE_PCI_BUS_ID, aDevice.getValue());
if (result != CUresult.CUDA_SUCCESS) { if (result != CUresult.CUDA_SUCCESS) {
System.out.println("Nvidia::getGpus cuDeviceGetAttribute for CU_DEVICE_ATTRIBUTE_PCI_BUS_ID failed (ret: " + CUresult.stringFor(result) + ")"); Log.getInstance().error("Nvidia::getGpus cuDeviceGetAttribute for CU_DEVICE_ATTRIBUTE_PCI_BUS_ID failed (ret: " + CUresult.stringFor(result) + ")");
continue; continue;
} }
result = cudalib.cuDeviceGetAttribute(pciDeviceId, CUDeviceAttribute.CU_DEVICE_ATTRIBUTE_PCI_DEVICE_ID, aDevice.getValue()); result = cudalib.cuDeviceGetAttribute(pciDeviceId, CUDeviceAttribute.CU_DEVICE_ATTRIBUTE_PCI_DEVICE_ID, aDevice.getValue());
if (result != CUresult.CUDA_SUCCESS) { if (result != CUresult.CUDA_SUCCESS) {
System.out.println("Nvidia::getGpus cuDeviceGetAttribute for CU_DEVICE_ATTRIBUTE_PCI_DEVICE_ID failed (ret: " + CUresult.stringFor(result) + ")"); Log.getInstance().error("Nvidia::getGpus cuDeviceGetAttribute for CU_DEVICE_ATTRIBUTE_PCI_DEVICE_ID failed (ret: " + CUresult.stringFor(result) + ")");
continue; continue;
} }
@@ -249,7 +250,7 @@ public class Nvidia implements GPULister {
result = cudalib.cuDeviceGetName(name, 256, num); result = cudalib.cuDeviceGetName(name, 256, num);
if (result != CUresult.CUDA_SUCCESS) { if (result != CUresult.CUDA_SUCCESS) {
System.out.println("Nvidia::getGpus cuDeviceGetName failed (ret: " + CUresult.stringFor(result) + ")"); Log.getInstance().error("Nvidia::getGpus cuDeviceGetName failed (ret: " + CUresult.stringFor(result) + ")");
continue; continue;
} }
@@ -263,7 +264,7 @@ public class Nvidia implements GPULister {
} }
if (result != CUresult.CUDA_SUCCESS) { if (result != CUresult.CUDA_SUCCESS) {
System.out.println("Nvidia::getGpus cuDeviceTotalMem failed (ret: " + CUresult.stringFor(result) + ")"); Log.getInstance().error("Nvidia::getGpus cuDeviceTotalMem failed (ret: " + CUresult.stringFor(result) + ")");
return null; return null;
} }
@@ -272,13 +273,13 @@ public class Nvidia implements GPULister {
nvml = Native.load(os.getNVMLLib(), NVML.class); nvml = Native.load(os.getNVMLLib(), NVML.class);
} }
catch (UnsatisfiedLinkError e) { catch (UnsatisfiedLinkError e) {
System.out.println("Nvidia::getGpus failed to load NVML library"); Log.getInstance().error("Nvidia::getGpus failed to load NVML library");
return null; return null;
} }
result = nvml.nvmlInit_v2(); result = nvml.nvmlInit_v2();
if (result != NVMLResult.NVML_SUCCESS) { if (result != NVMLResult.NVML_SUCCESS) {
System.out.println("Nvidia::getGpus failed to nvmlInit failed. Returned " + result); Log.getInstance().error("Nvidia::getGpus failed to nvmlInit failed. Returned " + result);
return null; return null;
} }
@@ -287,7 +288,7 @@ public class Nvidia implements GPULister {
result = nvml.nvmlSystemGetDriverVersion(driverStringBuffer, stringLength); //The returned char* will never exceed 80 characters according to the docs result = nvml.nvmlSystemGetDriverVersion(driverStringBuffer, stringLength); //The returned char* will never exceed 80 characters according to the docs
if (result != NVMLResult.NVML_SUCCESS) { if (result != NVMLResult.NVML_SUCCESS) {
System.out.println("Nvidia::getGpus failed to retrieve driver version"); Log.getInstance().error("Nvidia::getGpus failed to retrieve driver version");
nvml.nvmlShutdown(); nvml.nvmlShutdown();
return null; return null;
} }
@@ -297,7 +298,7 @@ public class Nvidia implements GPULister {
String driverVersion = (new String(driverStringBuffer)).trim(); String driverVersion = (new String(driverStringBuffer)).trim();
boolean driverTooOld = GPUDevice.compareVersions(driverVersion, MINIMUM_DRIVER_VERSION) < 0; boolean driverTooOld = GPUDevice.compareVersions(driverVersion, MINIMUM_DRIVER_VERSION) < 0;
if (driverTooOld) { if (driverTooOld) {
System.out.println("Nvidia::getGpus driver version: " + driverVersion + " is too old. Please update to version: " + MINIMUM_DRIVER_VERSION + " or newer." ); Log.getInstance().error("Nvidia::getGpus driver version: " + driverVersion + " is too old. Please update to version: " + MINIMUM_DRIVER_VERSION + " or newer." );
return null; return null;
} }

7
src/main/java/com/sheepit/client/os/Windows.java
View File

@@ -23,6 +23,7 @@ import java.io.IOException;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import com.sheepit.client.Log;
import com.sheepit.client.os.windows.Kernel32Lib; import com.sheepit.client.os.windows.Kernel32Lib;
import com.sheepit.client.os.windows.WinProcess; import com.sheepit.client.os.windows.WinProcess;
import com.sun.jna.Native; import com.sun.jna.Native;
@@ -53,13 +54,13 @@ public class Windows extends OS {
kernel32lib.SetErrorMode(Kernel32Lib.SEM_NOGPFAULTERRORBOX); kernel32lib.SetErrorMode(Kernel32Lib.SEM_NOGPFAULTERRORBOX);
} }
catch (UnsatisfiedLinkError e) { catch (UnsatisfiedLinkError e) {
System.out.println("OS.Windows::exec failed to load kernel32lib " + e); Log.getInstance().error("OS.Windows::exec failed to load kernel32lib " + e);
} }
catch (ExceptionInInitializerError e) { catch (ExceptionInInitializerError e) {
System.out.println("OS.Windows::exec failed to load kernel32lib " + e); Log.getInstance().error("OS.Windows::exec failed to load kernel32lib " + e);
} }
catch (Exception e) { catch (Exception e) {
System.out.println("OS.Windows::exec failed to load kernel32lib " + e); Log.getInstance().error("OS.Windows::exec failed to load kernel32lib " + e);
} }
ProcessBuilder builder = new ProcessBuilder(command); ProcessBuilder builder = new ProcessBuilder(command);

7
src/main/java/com/sheepit/client/os/windows/WinProcess.java
View File

@@ -25,6 +25,7 @@ import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import com.sheepit.client.Log;
import com.sun.jna.Native; import com.sun.jna.Native;
import com.sun.jna.Pointer; import com.sun.jna.Pointer;
import com.sun.jna.platform.win32.Kernel32; import com.sun.jna.platform.win32.Kernel32;
@@ -52,13 +53,13 @@ public class WinProcess {
this.kernel32lib = (Kernel32Lib) Native.load(Kernel32Lib.path, Kernel32Lib.class); this.kernel32lib = (Kernel32Lib) Native.load(Kernel32Lib.path, Kernel32Lib.class);
} }
catch (UnsatisfiedLinkError e) { catch (UnsatisfiedLinkError e) {
System.out.println("WinProcess::construct " + e); Log.getInstance().error("WinProcess::construct " + e);
} }
catch (ExceptionInInitializerError e) { catch (ExceptionInInitializerError e) {
System.out.println("WinProcess::construct " + e); Log.getInstance().error("WinProcess::construct " + e);
} }
catch (Exception e) { catch (Exception e) {
System.out.println("WinProcess::construct " + e); Log.getInstance().error("WinProcess::construct " + e);
} }
} }

7
src/main/java/com/sheepit/client/standalone/GuiSwing.java
View File

@@ -26,6 +26,7 @@ import com.sheepit.client.Client;
import com.sheepit.client.Configuration; import com.sheepit.client.Configuration;
import com.sheepit.client.DownloadProgress; import com.sheepit.client.DownloadProgress;
import com.sheepit.client.Gui; import com.sheepit.client.Gui;
import com.sheepit.client.Log;
import com.sheepit.client.SettingsLoader; import com.sheepit.client.SettingsLoader;
import com.sheepit.client.Stats; import com.sheepit.client.Stats;
import com.sheepit.client.TransferStats; import com.sheepit.client.TransferStats;
@@ -306,7 +307,7 @@ public class GuiSwing extends JFrame implements Gui {
this.activityWorking.setRenderedFrame(framesRendered); this.activityWorking.setRenderedFrame(framesRendered);
} }
else { else {
System.out.println("GuiSwing::AddFrameRendered() error: no working activity"); Log.getInstance().error("GuiSwing::AddFrameRendered() error: no working activity");
} }
} }
@@ -385,7 +386,7 @@ public class GuiSwing extends JFrame implements Gui {
public void hideToTray() { public void hideToTray() {
if (sysTray == null || SystemTray.isSupported() == false) { if (sysTray == null || SystemTray.isSupported() == false) {
System.out.println("GuiSwing::hideToTray SystemTray not supported!"); Log.getInstance().debug("GuiSwing::hideToTray SystemTray not supported!");
return; return;
} }
@@ -394,7 +395,7 @@ public class GuiSwing extends JFrame implements Gui {
sysTray.add(trayIcon); sysTray.add(trayIcon);
} }
catch (AWTException e) { catch (AWTException e) {
System.out.println("GuiSwing::hideToTray an error occured while trying to add system tray icon (exception: " + e + ")"); Log.getInstance().error("GuiSwing::hideToTray an error occured while trying to add system tray icon (exception: " + e + ")");
return; return;
} }