updated commands

xfreerdpctl

@@ -2,7 +2,7 @@
 
 ##Forkato da labcalcoloctl di Elisa Aliverti
 ##Autore: Nicolo' Palazzini
-##Ultima modifica: 20/04/2019
+##Ultima modifica: 2/05/2019
 
 from time import time
 start = time()
@@ -24,7 +24,7 @@ parser.add_argument( '-a', '--all', action='store_true', dest='lcm', help='All L
 parser.add_argument( '-n', nargs='+', dest='node', help='Select one or more nodes (at least one)' )
 parser.add_argument( '-1', '--lcm1', action='store_true', dest='lcm1', help='LCM1 nodes are considered' )
 parser.add_argument( '-2', '--lcm2', action='store_true', dest='lcm2', help='LCM2 nodes are considered' )
-parser.add_argument( '-v', '--version', action='version', version='%(prog)s 1.0 beta', help='Print program version' )
+parser.add_argument( '-v', '--version', action='version', version='%(prog)s 1.0', help='Print program version' )
 
 args = parser.parse_args()
 
@@ -71,9 +71,10 @@ class Host(Thread):
             return False
 
     def status(self):
-        statuscmd = "ps aux | grep 'sleep 300' | grep -v grep"
-        ssh = self.sshcommand(statuscmd)
-        result = [ l for l in ssh.stdout.readlines() if 'sleep 300' in l ]
+        statuscmd = "ps aux | grep 'xfreerdp' | grep -v grep"
+        ssh = self.sshcommand(statuscmd) 
+        result = [ l for l in ssh.stdout.readlines() if '/usr/bin/xfreerdp /cert-ignore /f /v:tolab.fisica.unimi.it' in l ]
+
         if result == []:
             return False
         else:
@@ -82,7 +83,7 @@ class Host(Thread):
     def xstart(self):
         if self.up:
             if not self.running:
-                startcmd = "sleep 300"  #'startx /usr/bin/xfreerdp /cert-ignore /f /v:tolab.fisica.unimi.it &> /dev/null &'
+                startcmd = "startx /usr/bin/xfreerdp /cert-ignore /f /v:tolab.fisica.unimi.it &> /dev/null &"
                 self.sshcommand(startcmd)
                 print 'xfreerdp started on ' + self.hostname
             else:
@@ -93,7 +94,7 @@ class Host(Thread):
     def xstop(self):
         if self.up:
             if self.running:
-                stopcmd = "pkill sleep" #pericoloso (testato e funzionante con pkill xfreerdp)
+                stopcmd = "pkill xfreerdp"
                 self.sshcommand(stopcmd)
                 print 'xfreerdp stopped on ' + self.hostname
             else: