diff --git a/config.py b/config.py index 1ea6b35..d8fd135 100644 --- a/config.py +++ b/config.py @@ -21,9 +21,9 @@ LOG_FILE = "~/minerva.log" COMMAND_NAME_SEPERATOR = "\n" -UPDATE_COMMANDS = [ - ["uptime:", "uptime"], - ["mdstat:", 'cat /proc/mdstat | grep block | sed "s/ / /" | sed "s/ / /" | sed "s/ / /" | sed "s/ / /" | sed "s/ / /"'], - ["lxc:", 'lxc-ls -f -F name,state | grep -v "NAME" | grep -v \- | sed "s/ / /" | sed "s/ / /" | sed "s/ / /" | sed "s/ / /" | sed "s/ / /" | sed "s/ / /" | sed "s/ / /" | sed "s/ /: /" | sed "s/RUNNING/UP/" | sed "s/STOPPED/DOWN/"'], - ["df:", 'df -h --output=source,size,used | grep /dev/ | grep -v tmpfs | sed "s/ / /" | sed "s/ / /" | sed "s/ / /" | sed "s/ / /" | sed "s/ / /" | sed "s/ / /" | sed "s/ / /" | sed "s/ / /" | sed "s/ / /"'] -] +UPDATE_COMMANDS = { + "uptime:": "uptime", + "mdstat:": 'cat /proc/mdstat | grep block | sed "s/ / /" | sed "s/ / /" | sed "s/ / /" | sed "s/ / /" | sed "s/ / /"', + "lxc:": 'lxc-ls -f -F name,state | grep -v "NAME" | grep -v \- | sed "s/ / /" | sed "s/ / /" | sed "s/ / /" | sed "s/ / /" | sed "s/ / /" | sed "s/ / /" | sed "s/ / /" | sed "s/ /: /" | sed "s/RUNNING/UP/" | sed "s/STOPPED/DOWN/"', + "df:": 'df -h --output=source,size,used | grep /dev/ | grep -v tmpfs | sed "s/ / /" | sed "s/ / /" | sed "s/ / /" | sed "s/ / /" | sed "s/ / /" | sed "s/ / /" | sed "s/ / /" | sed "s/ / /" | sed "s/ / /"' +} diff --git a/main.py b/main.py index 15ea8ac..cf53e4f 100644 --- a/main.py +++ b/main.py @@ -81,8 +81,8 @@ if __name__ == "__main__": for command in UPDATE_COMMANDS: - output = subprocess.Popen(command[1], shell=True, stdout=PIPE).stdout.read() - api.PostUpdate(status = (command[0] + COMMAND_NAME_SEPERATOR + output)) + output = subprocess.Popen(UPDATE_COMMANDS[command], shell=True, stdout=PIPE).stdout.read() + api.PostUpdate(status = (command + COMMAND_NAME_SEPERATOR + output)) time.sleep(5 * 60)