Changeset 38181

Timestamp:

Apr 24, 2015, 11:29:43 AM (11 years ago)

Author:

watersc1

Message:

Merge of fixed version of sc_remote_exec/poll

Location:

tags/ipp-20150329/ippScripts/scripts

Files:

• sc_remote_exec.pl (modified) (3 diffs, 1 prop)
• sc_remote_poll.pl (modified) (3 diffs, 1 prop)

tags/ipp-20150329/ippScripts/scripts/sc_remote_exec.pl

@@ -95 +95 @@
 # Hard coded values
 my $DMZ_HOST = $remote_recipe{DMZ_HOST};
-my @SEC_HOSTS= @{ $remote_recipe{SEC_HOST} };
-my $SEC_HOST;
-if ($#SEC_HOSTS != -1) {
-    $SEC_HOST = $SEC_HOSTS[int(rand(@SEC_HOSTS))]; 
-}
-else {
-    $SEC_HOST = '';
+my @SEC_HOSTS = ();
+my $SEC_HOST = '';
+
+if (defined($remote_recipe{SEC_HOST})) {
+    @SEC_HOSTS = @{ $remote_recipe{SEC_HOST} };
+    if ($#SEC_HOSTS != -1) {
+        
+        $SEC_HOST = $SEC_HOSTS[int(rand(@SEC_HOSTS))]; 
+    }
+    else {
+        $SEC_HOST = '';
+    }
 }
 my $IPP_PATH = $remote_recipe{IPP_PATH};
 my $remote_root  = $remote_recipe{REMOTE_ROOT};
+
 
 my $ipprc = PS::IPP::Config->new( $camera ) or my_die( "Unable to set up", $remote_id);
@@ -201 +207 @@
     }
     else {
-        $cmd = "$ssh -n $DMZ_HOST $cmd";
+        $cmd = "$scp $file $DMZ_HOST:${destination}";
     }
 
@@ -223 +229 @@
     }
     else {
-        $cmd = "$ssh -n $DMZ_HOST $cmd";
+        $cmd = "$scp $DMZ_HOST:${destination}  $file";
     }
 

tags/ipp-20150329/ippScripts/scripts/sc_remote_poll.pl

@@ -65 +65 @@
     defined($cmd_recipe) and
     defined($job_id);
-
 
 
@@ -116 +115 @@
 # Hard coded values
 my $DMZ_HOST = $remote_recipe{DMZ_HOST};
-my @SEC_HOSTS= @{ $remote_recipe{SEC_HOST} };
-my $SEC_HOST;
-if ($#SEC_HOSTS != -1) {
-    $SEC_HOST = $SEC_HOSTS[int(rand(@SEC_HOSTS))]; 
-}
-else {
-    $SEC_HOST = '';
+my @SEC_HOSTS = ();
+my $SEC_HOST = '';
+
+if (defined($remote_recipe{SEC_HOST})) {
+    @SEC_HOSTS = @{ $remote_recipe{SEC_HOST} };
+    if ($#SEC_HOSTS != -1) {
+        $SEC_HOST = $SEC_HOSTS[int(rand(@SEC_HOSTS))]; 
+    }
+    else {
+        $SEC_HOST = '';
+    }
 }
 my $IPP_PATH = $remote_recipe{IPP_PATH};
@@ -434 +437 @@
     }
     else {
-        $cmd = "$scp $file ${DMZ_HOST}:${destination}";
+        $cmd = "$scp  ${DMZ_HOST}:${destination} $file";
     }