# HG changeset patch
# User Dennis Fink <dennis.fink@c3l.lu>
# Date 2013-11-17 16:06:29
# Node ID 10a3ee9cb0c8339f22102c2fd9511c804fc83981
# Parent  27d0f4e3608ba12d0fa19e23f34bbd3394d43a80

updated script

diff --git a/Scripts/update_server.py b/Scripts/update_server.py
--- a/Scripts/update_server.py
+++ b/Scripts/update_server.py
@@ -10,7 +10,7 @@ from ast import literal_eval
 OBFS_REGEX = re.compile(r'^ServerTransportPlugin obfs2,obfs3')
 
 IP_REGEX = re.compile((r'^(OutboundBindAddress)'
-                       r' (\d{1,3}\.\d{1,3}\.\d{1,3}.\d{1,3})'))
+                       r' (\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})'))
 
 
 def read_tor_config(configfile="/etc/tor/torrc"):
@@ -28,7 +28,7 @@ def get_tor_status(name='tor'):
         pids = subprocess.check_output(['pidof', 'tor']).decode('utf-8')
         pids = pids.split(' ')
         pid_file = '.'.join([name, 'pid'])
-        pid = open('/'.join(['/var', 'run', name, pid_file])).readline()
+        pid = open('/'.join(['/var', 'run', 'tor', pid_file])).readline()
 
         if pid in pids:
             return "Online"
@@ -67,7 +67,7 @@ def get_ip(tor_config):
     for i in tor_config:
         match = IP_REGEX.match(i)
 
-        if match:
+        if match is not None:
             return i.groups()[1]
         else:
             return None
@@ -108,7 +108,8 @@ def update_server(server_json, url):
 
     headers = {'Content-type': 'application/json', 'Accept': 'text/plain'}
 
-    response = requests.post(url + '/api/update', data=json.dumps(server_json), headers=headers)
+    response = requests.post(url + '/api/update', data=json.dumps(server_json),
+                             headers=headers)
     response.raise_for_status()
 
     return response.text