From 177df6bd10ce67c30cc083765ba6ed58b7c74aaf Mon Sep 17 00:00:00 2001 From: Pavel Valach Date: Tue, 25 Aug 2020 12:06:57 +0200 Subject: [PATCH] observium SMS - detach to another thing --- observium_func.py | 12 ++++++++++++ observium_sms.py | 8 +------- observium_sms_remote.py | 3 +-- 3 files changed, 14 insertions(+), 9 deletions(-) create mode 100755 observium_func.py diff --git a/observium_func.py b/observium_func.py new file mode 100755 index 0000000..2b50c7c --- /dev/null +++ b/observium_func.py @@ -0,0 +1,12 @@ +#!/usr/bin/python3 + +import time +import os +import sms_functions + +def assemble_sms(): + str_list = [] + str_list.append("Observium {}\n".format(os.environ.get('OBSERVIUM_TITLE'))) + str_list.append("{} [{}]\n".format(os.environ.get('OBSERVIUM_ENTITY_NAME'), os.environ.get('OBSERVIUM_ENTITY_DESCRIPTION'))) + str_list.append("{}".format(os.environ.get('OBSERVIUM_DURATION'))) + return ''.join(str_list) \ No newline at end of file diff --git a/observium_sms.py b/observium_sms.py index 7aef27c..0053071 100755 --- a/observium_sms.py +++ b/observium_sms.py @@ -7,13 +7,7 @@ from pydbus import SystemBus from gi.repository import GLib from datetime import datetime import sms_functions - -def assemble_sms(): - str_list = [] - str_list.append("Observium {}\n".format(os.environ.get('OBSERVIUM_TITLE'))) - str_list.append("{} [{}]\n".format(os.environ.get('OBSERVIUM_ENTITY_NAME'), os.environ.get('OBSERVIUM_ENTITY_DESCRIPTION'))) - str_list.append("{}".format(os.environ.get('OBSERVIUM_DURATION'))) - return ''.join(str_list) +from observium_func import assemble_sms def main(): # Setup logging diff --git a/observium_sms_remote.py b/observium_sms_remote.py index bbd41cd..8c58612 100755 --- a/observium_sms_remote.py +++ b/observium_sms_remote.py @@ -5,8 +5,7 @@ import time import os import sys from datetime import datetime -from observium_sms import assemble_sms -import sms_functions +from observium_func import assemble_sms def main(): # Setup logging