[Bf-extensions-cvs] SVN commit: /data/svn/bf-extensions [3658] trunk/py/scripts/tools/bi_farm: misc small changes

[Campbell Barton]

Revision: 3658
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-extensions&revision=3658
Author:   campbellbarton
Date:     2012-07-30 07:34:42 +0000 (Mon, 30 Jul 2012)
Log Message:
-----------
misc small changes

umask mode to 000 (Sergey)

Modified Paths:
--------------
    trunk/py/scripts/tools/bi_farm/master_ui.js
    trunk/py/scripts/tools/bi_farm/master_ui.py
    trunk/py/scripts/tools/bi_farm/new_master.py
    trunk/py/scripts/tools/bi_farm/new_node_command.sh
    trunk/py/scripts/tools/bi_farm/slideshow/preview_images_update.py
    trunk/py/scripts/tools/bi_farm/slideshow/slideshow.sh

Modified: trunk/py/scripts/tools/bi_farm/master_ui.js
===================================================================
--- trunk/py/scripts/tools/bi_farm/master_ui.js	2012-07-29 20:53:31 UTC (rev 3657)
+++ trunk/py/scripts/tools/bi_farm/master_ui.js	2012-07-30 07:34:42 UTC (rev 3658)
@@ -1,5 +1,5 @@
 // Maintanance message
-// alert("FARM IS UNDER MAINTANANCE FOR 1H - DO NOT SUBMIT ANY JOB PLEASE");
+// alert("FARM IS UNDER MAINTANANCE - DO NOT SUBMIT ANY JOB PLEASE");
 
 function request(url, data)
 {

Modified: trunk/py/scripts/tools/bi_farm/master_ui.py
===================================================================
--- trunk/py/scripts/tools/bi_farm/master_ui.py	2012-07-29 20:53:31 UTC (rev 3657)
+++ trunk/py/scripts/tools/bi_farm/master_ui.py	2012-07-30 07:34:42 UTC (rev 3658)
@@ -510,7 +510,7 @@
             output("<form method='post' action='/job_add'>\n")
             output("<input name='id' value='' size='50'/>\n")
             output("<input name='latest' checked='yes' type='checkbox' onchange='this.form.revision.disabled = this.checked;'>Latest</input>\n")
-            output("<input name='revision' value='%s' size='10'/>\n" % (revision,))
+            output("<input name='revision' disabled='disabled' value='%s' size='10'/>\n" % (revision,))
             output("<select name='quality'>\n")
             for option in Job.quality_types:
                 if option == "File settings":

Modified: trunk/py/scripts/tools/bi_farm/new_master.py
===================================================================
--- trunk/py/scripts/tools/bi_farm/new_master.py	2012-07-29 20:53:31 UTC (rev 3657)
+++ trunk/py/scripts/tools/bi_farm/new_master.py	2012-07-30 07:34:42 UTC (rev 3658)
@@ -55,7 +55,8 @@
     logpath = log_file(ip)
 
     # node exception
-    if int(ip.split(".")[-1]) >= 200:
+    ip_groubs = ip.split(".")
+    if int(ip_groubs[-2]) >= 4 and int(ip_groubs[-1]) >= 200:
         user = "root"
     elif ip == "192.168.4.14":
         user = "user"
@@ -65,7 +66,7 @@
         cmd += " >> %s 2>&1" % logpath
 
     # set the umask so files & dirs we create can be moved about
-    cmd_final = "ssh -n -f -p 22 %s@%s 'umask 002 ; FARM_DIR=\"%s\" %s'" % (user, ip, FARM_DIR, cmd)
+    cmd_final = "ssh -n -f -p 22 %s@%s 'umask 000 ; FARM_DIR=\"%s\" %s'" % (user, ip, FARM_DIR, cmd)
 
     if log:
         file = open(logpath, 'a+')

Modified: trunk/py/scripts/tools/bi_farm/new_node_command.sh
===================================================================
--- trunk/py/scripts/tools/bi_farm/new_node_command.sh	2012-07-29 20:53:31 UTC (rev 3657)
+++ trunk/py/scripts/tools/bi_farm/new_node_command.sh	2012-07-30 07:34:42 UTC (rev 3658)
@@ -1,6 +1,6 @@
 #!/bin/bash
 # wrapper so we can do a simple killall to stop any a command 
-umask 0002
+umask 0000
 echo $@
 $@
 

Modified: trunk/py/scripts/tools/bi_farm/slideshow/preview_images_update.py
===================================================================
--- trunk/py/scripts/tools/bi_farm/slideshow/preview_images_update.py	2012-07-29 20:53:31 UTC (rev 3657)
+++ trunk/py/scripts/tools/bi_farm/slideshow/preview_images_update.py	2012-07-30 07:34:42 UTC (rev 3658)
@@ -36,7 +36,7 @@
 SLEEP = 120.0
 
 def remote_command(cmd, ip="192.168.4.71", user="guest"):
-    cmd_final = "ssh -n -p 22 %s@%s 'umask 002 ; %s'" % (user, ip, cmd)
+    cmd_final = "ssh -n -p 22 %s@%s 'umask 000 ; %s'" % (user, ip, cmd)
     print(cmd_final)
     os.system(cmd_final)
 

Modified: trunk/py/scripts/tools/bi_farm/slideshow/slideshow.sh
===================================================================
--- trunk/py/scripts/tools/bi_farm/slideshow/slideshow.sh	2012-07-29 20:53:31 UTC (rev 3657)
+++ trunk/py/scripts/tools/bi_farm/slideshow/slideshow.sh	2012-07-30 07:34:42 UTC (rev 3658)
@@ -1,11 +1,9 @@
 #!/bin/bash
-mplayer -loop 0 -mf fps=0.1 -vo xv,x11 -fixed-vo -fs \
-	mf:///shared/software/render_farm/slideshow/preview_big*.png \
-	mf:///shared/software/render_farm/slideshow/preview_big*.png \
-	mf:///shared/software/render_farm/slideshow/preview_big*.png \
-	mf:///shared/software/render_farm/slideshow/preview_big*.png \
-	mf:///shared/software/render_farm/slideshow/preview_big*.png \
-	mf:///shared/software/render_farm/slideshow/preview_big*.png \
-	mf:///shared/software/render_farm/slideshow/preview_big*.png
+while true
+do
+	mplayer -mf fps=0.01 -vo xv,x11 -fixed-vo -fs \
+		mf:///shared/software/render_farm/slideshow/preview_big*.png
 
+	sleep 1
 
+done