diff --git a/bin/uplink b/bin/uplink index a45d852..38cb8f0 100755 --- a/bin/uplink +++ b/bin/uplink @@ -31,6 +31,7 @@ import json import logging import logging.handlers import os +import socket import sys import time @@ -47,7 +48,7 @@ MINOR changes are "just-in-time" changes or small enhancements which should not documentation. FIXES should never affect anything else then stability or security. """ -__version__ = '0.8.3.2' +__version__ = '0.8.4.0' __author__ = 'Johannes Findeisen ' logger = logging.getLogger('uplink') @@ -107,6 +108,10 @@ def main(): logger.error(str('[uplink] configuration error: {0}'.format(err))) sys.exit(1) + configuration.set_env_var('_hostname', socket.gethostname()) + + configuration.set_env_var('__version__', __version__) + configuration.set_env_var('_internal_start_date', time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(calendar.timegm(time.gmtime())))) configuration.set_env_var('_internal_start_timestamp', calendar.timegm(time.gmtime())) diff --git a/uplink/httpserver.py b/uplink/httpserver.py index bbaafa6..07e6e10 100644 --- a/uplink/httpserver.py +++ b/uplink/httpserver.py @@ -40,7 +40,8 @@ class HTTPServer: @cherrypy.expose def config(self): - return '[uplink] configuration[uplink@' + \ + self.__configuration.get_env_var("_hostname") + '] configuration
' + \
                json.dumps(vars(self.__configuration), sort_keys=True, indent=4) + \
diff --git a/uplink/uplink.py b/uplink/uplink.py
index b2fc827..43d0012 100644
--- a/uplink/uplink.py
+++ b/uplink/uplink.py
@@ -125,7 +125,7 @@ class Uplink(Daemon):
                     if fail_count == 1 or fail_count % notification_gammu_repeat == 0:
                         from uplink.notification import Notification
                         notification = Notification(self.__configuration)
-                        notification.send('[' + uplink['provider'] + '] ' + status)
+                        notification.send('[' + uplink['identifier'] + '] ' + status)
 
             logger.info(str(uplink['identifier'] + ': ' + status))