mirror of
https://github.com/LorenEteval/Furious.git
synced 2026-09-27 09:27:55 +03:00
Add logging when custom routing object not found
Signed-off-by: Loren Eteval <loren.eteval@proton.me>
This commit is contained in:
@@ -174,10 +174,15 @@ class ConnectAction(Action):
|
||||
)
|
||||
|
||||
def stopCore(self):
|
||||
self.XrayCore.registerExitCallback(None)
|
||||
self.Hysteria.registerExitCallback(None)
|
||||
|
||||
# Stop any potentially running core
|
||||
self.XrayCore.stop()
|
||||
self.Hysteria.stop()
|
||||
|
||||
self.coreRunning = False
|
||||
|
||||
def showConnectingProgressBar(self):
|
||||
if APP().ShowProgressBarWhenConnecting == Switch.ON_:
|
||||
self.connectingProgressBar.progressBar.setValue(0)
|
||||
@@ -242,9 +247,6 @@ class ConnectAction(Action):
|
||||
def reset(self):
|
||||
# Reset everything
|
||||
|
||||
self.XrayCore.registerExitCallback(None)
|
||||
self.Hysteria.registerExitCallback(None)
|
||||
|
||||
self.stopCore()
|
||||
|
||||
self.hideConnectingProgressBar()
|
||||
@@ -448,9 +450,13 @@ class ConnectAction(Action):
|
||||
logger.info(f'RoutingObject: {route[XrayCore.name()]}')
|
||||
|
||||
self.coreJSON['routing'] = route[XrayCore.name()]
|
||||
except Exception:
|
||||
except Exception as ex:
|
||||
# Any non-exit exceptions
|
||||
|
||||
logger.error(
|
||||
f'get custom routing object failed: {ex}. Fast fail'
|
||||
)
|
||||
|
||||
# Fast fail
|
||||
self.coreJSON = {}
|
||||
|
||||
@@ -523,9 +529,13 @@ class ConnectAction(Action):
|
||||
Hysteria.rule(route[Hysteria.name()].get('acl')),
|
||||
Hysteria.mmdb(route[Hysteria.name()].get('mmdb')),
|
||||
)
|
||||
except Exception:
|
||||
except Exception as ex:
|
||||
# Any non-exit exceptions
|
||||
|
||||
logger.error(
|
||||
f'get custom routing object failed: {ex}. Fast fail'
|
||||
)
|
||||
|
||||
# Fast fail
|
||||
self.Hysteria.start('', '', '')
|
||||
|
||||
@@ -686,8 +696,7 @@ class ConnectAction(Action):
|
||||
# 1. No valid HTTP proxy endpoint. reset / disconnect has been called
|
||||
|
||||
if self.isConnecting():
|
||||
# 2. Core has exited. disconnectReason must not be empty
|
||||
assert self.disconnectReason
|
||||
# 2. Core has exited
|
||||
|
||||
self.disconnectAction(self.disconnectReason)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user