# HG changeset patch
# User Dennis Fink <dennis.fink@c3l.lu>
# Date 2015-08-26 18:32:29
# Node ID 6a5a1585589746626563ffee1efa59ac48bd4ae5
# Parent  cce68b00e8fe2973802811c54de9cb43c9e9a50e

Remove status from model

tor_status was renamed to status. Because people are only interested in if the
tor process is actually running!

diff --git a/ennstatus/api/model.py b/ennstatus/api/model.py
--- a/ennstatus/api/model.py
+++ b/ennstatus/api/model.py
@@ -87,7 +87,6 @@ class Server:
         self.name = kwargs['name']
         self.type = kwargs['type']
         self.status = kwargs.get('status')
-        self.tor_status = kwargs.get('tor_status')
         self.fingerprint = kwargs['fingerprint']
         self.last_updated = kwargs['last_updated']
         self.country = kwargs['country']
@@ -235,7 +234,5 @@ class Server:
 
         if delta.seconds >= 3600:
             self.status = False
-            self.tor_status = False
-            return False
-        else:
-            return True
+        elif delta.seconds >= 600:
+            self.status = None
diff --git a/ennstatus/api/schema/server.json b/ennstatus/api/schema/server.json
--- a/ennstatus/api/schema/server.json
+++ b/ennstatus/api/schema/server.json
@@ -9,9 +9,6 @@
         "status": {
             "$ref": "#/definitions/status_data"
         },
-        "tor_status": {
-            "$ref": "#/definitions/status_data"
-        },
         "country": {
             "type": "string",
             "enum": [
@@ -108,7 +105,6 @@
     "required": [
         "name",
         "status",
-        "tor_status",
         "last_updated",
         "country",
         "fingerprint",
diff --git a/ennstatus/api/views.py b/ennstatus/api/views.py
--- a/ennstatus/api/views.py
+++ b/ennstatus/api/views.py
@@ -61,7 +61,6 @@ def update():
     data['last_updated'] = strict_rfc3339.timestamp_to_rfc3339_utcoffset(
         datetime.utcnow().timestamp()
     )
-    data['status'] = True
 
     try:
         server = Server.from_json(json.dumps(data))
diff --git a/ennstatus/templates/api/export/xml/server.xml b/ennstatus/templates/api/export/xml/server.xml
--- a/ennstatus/templates/api/export/xml/server.xml
+++ b/ennstatus/templates/api/export/xml/server.xml
@@ -2,7 +2,6 @@
     <type>{{ server.type }}</type>
     <name>{{ server.name }}</name>
     <status>{{ server.status }}</status>
-    <tor_status>{{ server.tor_status }}</tor_status>
     <country>{{ server.country }}</country>
     <last_updated>{{ server.last_updated }}</last_updated>
     <fingerprint>{{ serverfingerprint }}</fingerprint>
diff --git a/ennstatus/templates/status/macros.html b/ennstatus/templates/status/macros.html
--- a/ennstatus/templates/status/macros.html
+++ b/ennstatus/templates/status/macros.html
@@ -50,9 +50,9 @@
 
 {% macro create_server_table(server_type, servers) %}
   {% if server_type in ('exit', 'relay') %}
-    {% set headers = ('#', 'Name', 'IP', 'IP6', 'Server Status', 'Tor Status', 'Country', 'Fingerprint', 'Last Updated <noscript>(UTC)</noscript>') %}
+    {% set headers = ('#', 'Name', 'IP', 'IP6', 'Tor Status', 'Country', 'Fingerprint', 'Last Updated <noscript>(UTC)</noscript>') %}
   {% else %}
-    {% set headers = ('#', 'Name', 'Server Status', 'Tor Status', 'Country', 'Fingerprint', 'OBFS', 'FTEProxy', 'Flashproxy', 'meek', 'Last Updated <noscript>(UTC)</noscript>') %}
+    {% set headers = ('#', 'Name', 'Tor Status', 'Country', 'Fingerprint', 'OBFS', 'FTEProxy', 'Flashproxy', 'meek', 'Last Updated <noscript>(UTC)</noscript>') %}
   {% endif %}
   <h2>{{ server_type|title }}</h2>
   <table class="table table-bordered table-striped sortable">
@@ -80,9 +80,7 @@
               {% endif %}
             </td>
           {% endif %}
-          {% for status in (server.status, server.tor_status) %}
-            <td>{{ colorize_status(status) }}</td>
-          {% endfor %}
+          <td>{{ colorize_status(server.status) }}</td>
           <td>{{ create_country(server.country) }}</td>
           <td>{{ create_fingerprint(server.fingerprint, server.type) }}</td>
           {% if server_type == 'bridge' %}