add logs folder

Dragon2fly · Nov 15, 2016 · 9aed7f4 · 9aed7f4
1 parent f9c836f
commit 9aed7f4
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 6 deletions.
diff --git a/logs/.gitignore b/logs/.gitignore
@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore
diff --git a/vpn_indicator.py b/vpn_indicator.py
@@ -20,11 +20,13 @@
 
     gi.require_version('Notify', '0.7')
     from gi.repository import Notify as notify
+
+    satisfied = True
 except ImportError:
     print >> sys.stderr, 'Lack of Gtk related modules!'
     print >> sys.stderr, 'VPN indicator will not run!'
     print >> sys.stderr, 'You should try "sudo apt-get install gir1.2-appindicator3-0.1 python-gobject"'
-    sys.exit()
+    satisfied = False
 
 
 class InfoServer:
@@ -78,12 +80,16 @@ def check_io(self, q_info):
                         print 'Server: Received dead signal'
                         self.sock.close()
                         return 0
-                    else:
+                    elif not self.is_connected:
                         self.client, addrr = self.sock.accept()
                         self.readlist.append(self.client)
                         self.is_connected = True
                         print 'Server: Connected with %s:%s' % addrr
                         q_info.put('connected')
+                    else:
+                        # reject all other request
+                        client, addrr = self.sock.accept()
+                        client.close()
 
                 else:  # client sent something
                     try:
@@ -101,6 +107,8 @@ def check_io(self, q_info):
                     except socket.error as e:
                         print 'Client die unexpectedly'
                         self.is_connected = False
+                    except Exception:
+                        sys.exit()
 
     def send(self, msg):
         if msg == 'dead':
@@ -355,7 +363,14 @@ def send_cmd(self, menu_obj, arg):
         self.send(arg)
 
     def callback(self):
+        global t
         try:
+            if not t.isAlive():
+                self.notifier.update("Error", "Server dead unexpectedly", icon=None)
+                self.notifier.show()
+                t = Thread(target=server.check_io, args=(q,))
+                t.start()
+
             data = self.q_info.get_nowait()
             self.reload(data)
         except Empty:
@@ -368,7 +383,7 @@ def callback(self):
         return True
 
 
-if __name__ == '__main__':
+if __name__ == '__main__' and satisfied:
     another_me = Popen(['pgrep', '-f', 'python vpn_indicator.py'], stdout=PIPE).communicate()[0]
     another_me = another_me.strip().split('\n')
 

diff --git a/vpnproxy_cli.py b/vpnproxy_cli.py
@@ -390,7 +390,7 @@ def vpn_manager(ovpn):
     for package in need:
         print '\n___Now installing', ctext(package, 'gB')
         print
-        call(['apt-get', 'install', package], env=env)
+        call(['apt-get', '-y', 'install', package], env=env)
 
     import requests
 

diff --git a/vpnproxy_tui.py b/vpnproxy_tui.py
@@ -1001,13 +1001,13 @@ def exit(self, loop, data=None):
         ctext("Have you 'sudo apt-get update' recently?", 'B') + "([yes] | no): ") else 'no'
 
     if update_now == 'yes':
-        call(['apt-get', '-y', 'update'], env=env)
+        call(['apt-get', 'update'], env=env)
 
     for package in need:
         print '\n___Now installing', ctext(package, 'gB')
         print
         if package in ['openvpn', 'python-pip']:
-            call(['apt-get', 'install', package], env=env)
+            call(['apt-get', '-y', 'install', package], env=env)
         else:
             call(['pip', 'install', package], env=env)
             globals()[package] = __import__(package)