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

Notification stuff and bug fixes.

Browse source
This commit is contained in:
Johannes Findeisen 2022-09-06 13:09:16 +02:00
commit 95f5f1a351
4 changed files with 21 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
etc/uplink.json.example
View file

@ -22,14 +22,14 @@
"speedtest_url": "https://go.microsoft.com/fwlink/?Linkid=850641", "speedtest_url": "https://go.microsoft.com/fwlink/?Linkid=850641",
"uplinks": [ "uplinks": [
{ {
"identifier": "vodafone", "identifier": "cable",
"primary": true, "primary": true,
"ip": "192.168.0.1",, "ip": "192.168.0.1",,
"password": "PASSWORD", "password": "PASSWORD",
"provider": "Cable Provider" "provider": "Cable Provider"
}, },
{ {
"identifier": "telekom", "identifier": "dsl",
"ip": "192.168.1.1", "ip": "192.168.1.1",
"password": "PASSWORD", "password": "PASSWORD",
"provider": "DSL Provider" "provider": "DSL Provider"

7
uplink/configuration.py
View file

@ -47,6 +47,7 @@ class Configuration:
self.__notification_gammu = False self.__notification_gammu = False
self.__notification_gammu_configuration = None self.__notification_gammu_configuration = None
self.__notification_gammu_receiver = None self.__notification_gammu_receiver = None
self.__notification_gammu_repeat = 30
self.__pid_file = '/tmp/uplink.pid' self.__pid_file = '/tmp/uplink.pid'
self.__run_mode = 'cron' self.__run_mode = 'cron'
self.__speedtest = False self.__speedtest = False
@ -115,6 +116,9 @@ class Configuration:
'notification_gammu' in self.__configuration: 'notification_gammu' in self.__configuration:
raise Exception('notification_gammu_receiver required!') raise Exception('notification_gammu_receiver required!')
if 'notification_gammu_repeat' in self.__configuration:
self.__notification_gammu_repeat = self.__configuration['notification_gammu_repeat']
if 'pid_file' in self.__configuration: if 'pid_file' in self.__configuration:
self.__pid_file = self.__configuration['pid_file'] self.__pid_file = self.__configuration['pid_file']
@ -193,6 +197,9 @@ class Configuration:
def get_notification_gammu_receiver(self): def get_notification_gammu_receiver(self):
return self.__notification_gammu_receiver return self.__notification_gammu_receiver
def get_notification_gammu_repeat(self):
return self.__notification_gammu_repeat
def get_pid_file(self): def get_pid_file(self):
return self.__pid_file return self.__pid_file

2
uplink/notification.py
View file

@ -40,4 +40,4 @@ class Notification:
# "SMSC": {"Location": 1}, # "SMSC": {"Location": 1},
#} #}
#self.__state_machine.SendSMS(message) #self.__state_machine.SendSMS(message)
logger.error(status) logger.info(status)

14
uplink/uplink.py
View file

@ -114,9 +114,17 @@ class Uplink(Daemon):
status = 'DOWN' status = 'DOWN'
if self.__configuration.get_notification_gammu() is True: if self.__configuration.get_notification_gammu() is True:
from uplink.notification import Notification notification_gammu_repeat = self.__configuration.get_notification_gammu_repeat()
notification = Notification(self.__configuration)
notification.send('STATUS: ' + status) """
send notification on first occurrence and on
(fail_count % notification_gammu_repeat == 0) which is
(notification_gammu_repeat * interval) in seconds.
"""
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)
logger.info(str(uplink['provider'] + ' (IP: ' + fritz_connection.external_ip + ') ' + logger.info(str(uplink['provider'] + ' (IP: ' + fritz_connection.external_ip + ') ' +
status)) status))