From e06ba5cecdc777da317db7b35d005592009b5a2c Mon Sep 17 00:00:00 2001 From: mkang18 Date: Tue, 15 Nov 2022 19:21:18 -0600 Subject: [PATCH] currently fixed --- config.yml | 4 ++-- ippigeon.py | 5 +++-- netstat.py | 10 +++++----- panel.py | 5 +++-- 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/config.yml b/config.yml index 2799474..3c75585 100644 --- a/config.yml +++ b/config.yml @@ -1,8 +1,8 @@ core: - autostart: false + autostart: true clockspeed: 20 interval: 10 - level: 2 + level: 0 localadmin: true sftp: filepath: diff --git a/ippigeon.py b/ippigeon.py index 81dc403..cdb302f 100644 --- a/ippigeon.py +++ b/ippigeon.py @@ -60,11 +60,12 @@ if linux or macos: def netstat_done(res): fprint("netstat done, processing") - #procdata_res = pool.apply_async(netstat.process, (res,), callback=process_done) - netstat.process(res) + procdata_res = pool.apply_async(netstat.process, (res,), callback=process_done) + #netstat.process(res) def process_done(res): if settings["running"] == True: + #settings["newdata"] = True fprint("uploading to sftp...") #ssh.sftp_send_data(res, config, datafile) procdata_res = pool.apply_async(ssh.sftp_send_data, (config, datafile, 'send'), callback=upload_done) diff --git a/netstat.py b/netstat.py index 5bf5c5e..2cb444a 100644 --- a/netstat.py +++ b/netstat.py @@ -84,7 +84,7 @@ def process(data): for line in output: string_split = line.split(" ") string_split = [i for i in string_split if i] - fprint("Input: " + str(string_split)) + #fprint("Input: " + str(string_split)) if string_split[1].find("Multipath") >= 0: break @@ -92,16 +92,16 @@ def process(data): continue if len(string_split) == 10: # no connection status - fprint(string_split) + #fprint(string_split) string_split.append(string_split[-1]) string_split[-7] = "UNKNOWN" string_split[-4] = string_split[-5] - fprint(string_split) + #fprint(string_split) - output2.append(["", string_split[0], string_split[3], string_split[4], string_split[5], string_split[8]]) - fprint("FINAL CSV: " + str(output2)) + output2.append(["Unknown", string_split[0], string_split[3], string_split[4], string_split[5], string_split[8]]) + #fprint("FINAL CSV: " + str(output2)) with open(find_data_file(util.datafile), "w", newline="") as f: writer = csv.writer(f) diff --git a/panel.py b/panel.py index cb5dfbc..e3ea425 100644 --- a/panel.py +++ b/panel.py @@ -164,7 +164,7 @@ class ServerPanel(wx.Panel): #main_sizer.SetBackgroundColour((44, 51, 51)) # self.pnl1.SetBackgroundColour(wx.BLACK) self.handle_columns() - #self.updatedata() + # self.updatedata() wx.CallAfter(self.updatedata) wx.GetApp().ProcessPendingEvents() @@ -238,6 +238,7 @@ class ServerPanel(wx.Panel): def on_start(self, event): fprint('in on_start') settings["running"] = True + # fprint("check if settings[running] is set to true" + str(settings["running"])) def on_stop(self, event): fprint('in on_stop') @@ -276,7 +277,7 @@ def openwindow(data, sets, kill): killme = kill displaydata = data settings = sets - if settings["loggedin"]: + if settings["loggedin"] == False: fprint("Creating server panel") loaddata() app = wx.App(False)