Skip to content

Commit e1eba12

Browse files
committed
fix stick issue
1 parent 73e5559 commit e1eba12

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

app/src/main/java/net/xndroid/fqrouter/FqrouterManager.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ public void run() {
270270
+ "sh " + sXndroidFile + "/python/bin"
271271
+ (Build.VERSION.SDK_INT > 17 ? "/python-launcher.sh " : "/python-launcher-nopie.sh ")
272272
+ sXndroidFile + "/fqrouter/manager/main.py run "
273-
+ ((AppModel.sDebug || AppModel.sLastFail) ? (" > " + sXndroidFile + "/log/fqrouter-output.log 2>&1 \n") : "\n")
273+
+ ((AppModel.sDebug || AppModel.sLastFail) ? (" > " + sXndroidFile + "/log/fqrouter-output.log 2>&1 \n") : " >/dev/null 2>&1\n")
274274
+ "exit\n";
275275
}else {
276276
cmd = "cd " + sXndroidFile + " \n"
@@ -283,7 +283,7 @@ public void run() {
283283
+ (Build.VERSION.SDK_INT > 17 ? "/python-launcher.sh " : "/python-launcher-nopie.sh ")
284284
+ sXndroidFile + "/fqrouter/manager/vpn.py "
285285
+ (Build.VERSION.SDK_INT >= 20 ? " 26.26.26.1 26.26.26.2 " : " 10.25.1.1 10.25.1.2 ")
286-
+ ((AppModel.sDebug || AppModel.sLastFail) ? (" > " + sXndroidFile + "/log/fqrouter-output.log 2>&1 \n") : "\n")
286+
+ ((AppModel.sDebug || AppModel.sLastFail) ? (" > " + sXndroidFile + "/log/fqrouter-output.log 2>&1 \n") : " >/dev/null 2>&1\n")
287287
+ "exit\n";
288288
}
289289
LogUtils.i("try to start fqrouter, cmd: " + cmd);

fqrouter/manager/main.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ def handle_exit(environ, start_response):
143143

144144

145145
def setup_logging():
146-
logging.basicConfig(stream=sys.stdout, level=logging.DEBUG if os.getenv('DEBUG') else (logging.CRITICAL + 1), format='%(asctime)s %(levelname)s %(message)s')
146+
logging.basicConfig(stream=sys.stdout, level=logging.DEBUG if os.getenv('DEBUG') else logging.INFO, format='%(asctime)s %(levelname)s %(message)s')
147147
log_level = logging.DEBUG if os.getenv('DEBUG') else logging.INFO
148148
handler = logging.handlers.RotatingFileHandler(
149149
MANAGER_LOG_FILE, maxBytes=1024 * 512, backupCount=0)

0 commit comments

Comments
 (0)