Again, wrong revert...

Samo Penic

2017-01-20 282bdafd491d8ce286fe13c40fbbc9379123f0d5

 trisurf/tsmgr.py

@@ -15,10 +15,10 @@
else:
   from urlparse import urlparse
   from vtk import *
   from . import VTKRendering
	
#import io

from IPython import embed
#from IPython import embed

import __main__ as main

@@ -80,7 +80,7 @@
   for h in hosts:
      for r in h['runs']:
         if(r.isFromSnapshot):
            file_list.append(r.snapshotFilename)
            file_list.append(r.snapshotFile)
         else:
            file_list.append(r.tapeFilename)
   file_list.append(main.__file__)
@@ -94,8 +94,12 @@
            port=host['port']
         except:
            port=22 #default ssh port
         rm=Remote.Connection(hostname=host['address'],username=username, port=port)
         rm.connect()
         try:
            rm=Remote.Connection(hostname=host['address'],username=username, port=port)
            rm.connect()
         except:
            host['_conn']=None
            continue
#         print ("Sendind file:"+main.__file__)
         if('remotebasepath' in host):
            remote_dir=host['remotebasepath']
@@ -131,6 +135,7 @@


def status_processes(args,host):
   print("in status processes")
   target_runs=getTargetRunIdxList(args)
   if target_runs==None:
      target_runs=list(range(1,len(host['runs'])+1))
@@ -256,12 +261,16 @@


def preview_vtu(args,host):
   #only for localhost at the moment
   if sys.version_info>=(3,0):
      print("Preview works only with python 2.7")
      exit(1)
   from . import VTKRendering
   target_runs=getTargetRunIdxList(args)
   if target_runs==None:
      target_runs=list(range(1,len(host['runs'])+1))
   if host['name'] == socket.gethostname():
      VTKRendering.Renderer(args,host)
      for i in target_runs:
         VTKRendering.Renderer(args,host,host['runs'][i-1])
   else:
      print("VTK rendering currently works on localhost only!")
		

def getListOfHostConfigurationByHostname(hosts,host):
   rhost=[]
@@ -310,16 +319,19 @@
         #print(remote_dir)
         #print(main.__file__)
         #print('python3 '+main.__file__+' -x '+" ".join(argv))
         output=host['_conn'].execute('cd '+remote_dir+ '; python3 '+main.__file__+' -x --originating-host ' +socket.gethostname()+" ".join(argv))
         for line in output:
            print(line.replace('\n',''))
         if(host['_conn']!=None):
#            print("was here, "+'cd '+remote_dir+ '; python3 '+main.__file__+' -x --originating-host ' +socket.gethostname()+" "+" ".join(argv))
            output=host['_conn'].execute('cd '+remote_dir+ '; python3 '+main.__file__+' -x --originating-host ' +socket.gethostname()+" "+" ".join(argv))
            for line in output:
               print(line.replace('\n',''))


   if not args['local_only']:
      print("Closing connections to remote hosts")
      for host in hosts:
         if(host['name'] !=socket.gethostname()):
            host['_conn'].disconnect()
            if(host['_conn']):
               host['_conn'].disconnect()