diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py
index 8f8d566191..a5833b2910 100755
--- a/synapse/app/homeserver.py
+++ b/synapse/app/homeserver.py
@@ -116,7 +116,7 @@ class SynapseHomeServer(HomeServer):
# extra resources to existing nodes. See self._resource_id for the key.
resource_mappings = {}
for (full_path, resource) in desired_tree:
- logging.info("Attaching %s to path %s", resource, full_path)
+ logger.info("Attaching %s to path %s", resource, full_path)
last_resource = self.root_resource
for path_seg in full_path.split('/')[1:-1]:
if not path_seg in last_resource.listNames():
@@ -221,12 +221,12 @@ def setup():
db_name = hs.get_db_name()
- logging.info("Preparing database: %s...", db_name)
+ logger.info("Preparing database: %s...", db_name)
with sqlite3.connect(db_name) as db_conn:
prepare_database(db_conn)
- logging.info("Database prepared in %s.", db_name)
+ logger.info("Database prepared in %s.", db_name)
hs.get_db_pool()
@@ -259,13 +259,16 @@ def setup():
else:
reactor.run()
+
def run():
with LoggingContext("run"):
reactor.run()
+
def main():
with LoggingContext("main"):
setup()
+
if __name__ == '__main__':
main()
diff --git a/synapse/app/synctl.py b/synapse/app/synctl.py
index abe055a64c..52a0b729f4 100755
--- a/synapse/app/synctl.py
+++ b/synapse/app/synctl.py
@@ -21,11 +21,12 @@ import signal
SYNAPSE = ["python", "-m", "synapse.app.homeserver"]
-CONFIGFILE="homeserver.yaml"
-PIDFILE="homeserver.pid"
+CONFIGFILE = "homeserver.yaml"
+PIDFILE = "homeserver.pid"
+
+GREEN = "\x1b[1;32m"
+NORMAL = "\x1b[m"
-GREEN="\x1b[1;32m"
-NORMAL="\x1b[m"
def start():
if not os.path.exists(CONFIGFILE):
@@ -43,12 +44,14 @@ def start():
subprocess.check_call(args)
print GREEN + "started" + NORMAL
+
def stop():
if os.path.exists(PIDFILE):
pid = int(open(PIDFILE).read())
os.kill(pid, signal.SIGTERM)
print GREEN + "stopped" + NORMAL
+
def main():
action = sys.argv[1] if sys.argv[1:] else "usage"
if action == "start":
@@ -62,5 +65,6 @@ def main():
sys.stderr.write("Usage: %s [start|stop|restart]\n" % (sys.argv[0],))
sys.exit(1)
-if __name__=='__main__':
+
+if __name__ == "__main__":
main()
|
