CodeCow/Auto.js
1
0
Fork 0
mirror of https://github.com/TonyJiangWJ/Auto.js.git synced 2026-06-24 21:33:16 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

log4j初始化时校验文件写入权限

Browse Source
This commit is contained in:
TonyJiangWJ 2022-01-08 02:03:53 +08:00
parent ccbc664855
commit 2205fd2f7a
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/autojs/autojs/autojs/AutoJs.java
View File

@ -92,7 +92,7 @@ public class AutoJs extends com.stardust.autojs.AutoJs {
LocalBroadcastManager.getInstance(application).registerReceiver(mLayoutInspectBroadcastReceiver, intentFilter);
this.enableDebugLog = PreferenceManager.getDefaultSharedPreferences(GlobalAppContext.get())
.getBoolean(GlobalAppContext.getString(R.string.key_enable_debug_log), false);
setLogFilePath(Pref.getScriptDirPath());
setLogFilePath(Pref.getScriptDirPath(), BuildConfig.DEBUG);
}
private void capture(LayoutInspectFloatyWindow window) {

19
autojs/src/main/java/com/stardust/autojs/AutoJs.java
View File

@ -26,6 +26,7 @@ import com.stardust.autojs.runtime.accessibility.AccessibilityConfig;
import com.stardust.autojs.runtime.api.AppUtils;
import com.stardust.autojs.script.AutoFileSource;
import com.stardust.autojs.script.JavaScriptSource;
import com.stardust.pio.PFiles;
import com.stardust.util.ResourceMonitor;
import com.stardust.util.ScreenMetrics;
import com.stardust.util.UiHandler;
@ -37,7 +38,6 @@ import org.mozilla.javascript.ContextFactory;
import org.mozilla.javascript.WrappedException;
import java.io.File;
import java.nio.file.Files;
import androidx.annotation.Nullable;
import androidx.annotation.RequiresApi;
@ -269,7 +269,7 @@ public abstract class AutoJs {
}
}
protected void setLogFilePath(String path) {
protected void setLogFilePath(String path, boolean isDebug) {
LogConfigurator logConfigurator = new LogConfigurator();
String pid = String.valueOf(android.os.Process.myPid());
logConfigurator.setFilePattern("%d - [%p]\t[" + pid + "] %c - %m%n");
@ -283,9 +283,20 @@ public abstract class AutoJs {
Log.d("LOG4J-CONFIG", "日志目录不是文件夹，无法记录log4j日志");
return;
}
logConfigurator.setFileName(path + "/.logs/autojs-log4j" + (BuildConfig.DEBUG ? "-debug" : "") + ".txt");
String logFileName = path + "/.logs/autojs-log4j" + (isDebug ? "-debug" : "") + ".txt";
try {
PFiles.write(logFileName, "");
} catch (Exception e) {
Log.d("LOG4J-CONFIG", "日志文件无写入权限，无法记录log4j日志");
return;
}
logConfigurator.setFileName(logFileName);
// 设置最大10MB
logConfigurator.setMaxFileSize(10 * 1024 * 1024);
logConfigurator.configure();
try {
logConfigurator.configure();
} catch (Exception e) {
Log.d("LOG4J-CONFIG", "初始化log4j失败");
}
}
}