linspector/uplink
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Added version to env vars, added local hostname to env vars and a bug fix.

Browse source
This commit is contained in:
Johannes Findeisen 2022-09-09 00:12:09 +02:00
commit 2dbc971275
3 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
bin/uplink
View file

@ -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 <you@hanez.org>'
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()))

3
uplink/httpserver.py
View file

@ -40,7 +40,8 @@ class HTTPServer:
@cherrypy.expose
def config(self):
return '<!DOCTYPE html><html><head><title>[uplink] configuration</title><meta ' + \
return '<!DOCTYPE html><html><head><title>[uplink@' + \
self.__configuration.get_env_var("_hostname") + '] configuration</title><meta ' + \
'http-equiv="refresh" content="60"></head><body><pre ' + \
'style="border:2px solid black;background:#1d2021;color:#f0751a;">' + \
json.dumps(vars(self.__configuration), sort_keys=True, indent=4) + \

2
uplink/uplink.py
View file

@ -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))