Compare commits

..

No commits in common. "7e679207195f261b09322238b2c6a68349080173" and "a31cd877f219f32f35486e0fc7f0217150c20820" have entirely different histories.

3 changed files with 12 additions and 9 deletions

View File

@ -250,7 +250,7 @@ if __name__ == '__main__':
sys.stderr = Logger(filename=find_data_file("output.log")) sys.stderr = Logger(filename=find_data_file("output.log"))
with Manager() as manager: with Manager() as manager:
with Pool(processes=5) as pool: with Pool(processes=5) as pool:
with open(find_data_file('config.yml'), 'r') as fileread: with open(find_data_file('config.yml'), 'r') as fileread:
#global config #global config
config = yaml.safe_load(fileread) config = yaml.safe_load(fileread)
@ -276,7 +276,6 @@ if __name__ == '__main__':
killme = manager.Value('d', 0) killme = manager.Value('d', 0)
#killme = False #killme = False
# launch background UI app as process # launch background UI app as process
util.clear_fwll()
p = Process(target=taskbartool.background, args=(displaydata,settings,killme)) p = Process(target=taskbartool.background, args=(displaydata,settings,killme))
p.start() p.start()
#p.join() # not a foreground job, so let's not join it #p.join() # not a foreground job, so let's not join it
@ -289,4 +288,11 @@ if __name__ == '__main__':
# launch loop - non-blocking! # launch loop - non-blocking!
counter = 0 counter = 0
while(keeprunning): while(keeprunning):
mainloop(pool) mainloop(pool)

View File

@ -242,7 +242,8 @@ class ServerPanel(wx.Panel):
def on_stop(self, event): def on_stop(self, event):
fprint('in on_stop') fprint('in on_stop')
settings["running"] = False settings["running"] = False
util.clear_fwll() # JANK JANK
util.run_cmd('Remove-NetFirewallRule -Group "IPPigeon"')
def on_window(self, event): def on_window(self, event):
fprint("open settings") fprint("open settings")

View File

@ -117,8 +117,4 @@ class Logger(object):
sleep(0) sleep(0)
def flush(self): def flush(self):
print("", end="") print("", end="")
def clear_fwll():
if win32:
run_cmd('Remove-NetFirewallRule -Group "IPPigeon"')