beenull/xpipe-mirror
1
0
Fork 0
mirror of https://github.com/xpipe-io/xpipe.git synced 2024-11-21 23:20:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

Rework debug mode

Browse source
This commit is contained in:
crschnick 2024-01-15 17:43:03 +00:00
parent 057398c317
commit 3e07e890ea
4 changed files with 44 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
app/src/main/java/io/xpipe/app/core/AppDebugModeNotice.java Normal file
View file

@ -0,0 +1,27 @@
package io.xpipe.app.core;
import io.xpipe.app.util.ThreadHelper;
import io.xpipe.core.util.ModuleHelper;
public class AppDebugModeNotice {
public static void printIfNeeded() {
if (!ModuleHelper.isImage() || !AppLogs.get().getLogLevel().equals("trace")) {
return;
}
var out = AppLogs.get().getOriginalSysOut();
var msg = """
****************************************
* You are running XPipe in debug mode! *
* The debug console output can contain *
* sensitive information and secrets. *
* Don't share this output via an *
* untrusted website or service. *
****************************************
""";
out.println(msg);
ThreadHelper.sleep(1000);
}
}

17
app/src/main/java/io/xpipe/app/core/AppLogs.java
View file

@ -2,8 +2,10 @@ package io.xpipe.app.core;
import io.xpipe.app.issue.ErrorEvent;
import io.xpipe.app.issue.TrackEvent;
import io.xpipe.app.util.XPipeSession;
import io.xpipe.core.util.Deobfuscator;
import lombok.Getter;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.FilenameUtils;
import org.slf4j.ILoggerFactory;
import org.slf4j.IMarkerFactory;
@ -35,7 +37,7 @@ public class AppLogs {
private static final String WRITE_LOGS_PROP = "io.xpipe.app.writeLogs";
private static final String DEBUG_PLATFORM_PROP = "io.xpipe.app.debugPlatform";
private static final String LOG_LEVEL_PROP = "io.xpipe.app.logLevel";
private static final String DEFAULT_LOG_LEVEL = "debug";
private static final String DEFAULT_LOG_LEVEL = "info";
private static final DateTimeFormatter FORMATTER =
DateTimeFormatter.ofPattern("yyyy-MM-dd_HH-mm-ss").withZone(ZoneId.systemDefault());
@ -95,6 +97,15 @@ public class AppLogs {
public static void init() {
var logDir = AppProperties.get().getDataDir().resolve("logs");
if (XPipeSession.get().isNewBuildSession()) {
try {
FileUtils.cleanDirectory(logDir.toFile());
} catch (Exception ex) {
ErrorEvent.fromThrowable(ex).handle();
}
}
var shouldLogToFile = shouldWriteLogs();
var now = Instant.now();
@ -236,8 +247,8 @@ public class AppLogs {
private static String determineLogLevel() {
if (System.getProperty(LOG_LEVEL_PROP) != null) {
String p = System.getProperty(WRITE_SYSOUT_PROP);
return DEFAULT_LEVELS.contains(p) ? p : "trace";
String p = System.getProperty(LOG_LEVEL_PROP);
return DEFAULT_LEVELS.contains(p) ? p : "info";
}
return DEFAULT_LOG_LEVEL;

1
app/src/main/java/io/xpipe/app/core/mode/OperationMode.java
View file

@ -100,6 +100,7 @@ public abstract class OperationMode {
AppUserDirectoryCheck.check();
AppTempCheck.check();
AppLogs.init();
AppDebugModeNotice.printIfNeeded();
AppProperties.logArguments(args);
AppProperties.logSystemProperties();
AppProperties.logPassedProperties();

2
core/src/main/java/io/xpipe/core/process/CommandControl.java
View file

@ -26,6 +26,8 @@ public interface CommandControl extends ProcessControl {
CLOSE
}
void setSensitive();
CommandControl withExceptionConverter(ExceptionConverter converter);
CommandControl withErrorFormatter(Function<String, String> formatter);