[tor-commits] [gettor/master] Update options with configs

[hiro at torproject.org]

commit fd71f48df802a2ecfc2dff4edd8fd8e6768052db
Author: hiro <hiro at torproject.org>
Date:   Tue Oct 15 16:18:28 2019 +0200

    Update options with configs
---
 bin/gettor_service      | 2 +-
 gettor/utils/options.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/gettor_service b/bin/gettor_service
index da45e9b..df4580e 100755
--- a/bin/gettor_service
+++ b/bin/gettor_service
@@ -20,7 +20,7 @@
 
 case "$1" in
 start)
-   twistd3 --python=scripts/gettor --logfile=log/gettor.log --pidfile=gettor.pid
+   twistd3 --python=scripts/gettor --logfile=log/gettor.log --pidfile=gettor.pid --config=gettor.conf.json
    ;;
 stop)
    kill -INT `cat gettor.pid`
diff --git a/gettor/utils/options.py b/gettor/utils/options.py
index ef4b346..54b9204 100644
--- a/gettor/utils/options.py
+++ b/gettor/utils/options.py
@@ -31,4 +31,4 @@ def parse_settings():
     returing translated strings
     """
     strings.load_strings("en")
-    return load_settings(config=False)
+    return load_settings(config='gettor.conf.json')