[Bf-extensions-cvs] SVN commit: /data/svn/bf-extensions [3540] trunk/py/scripts/tools/bi_farm: rename blender binary so killing it doesnt conflict with other running instances of blender (weak but works)

[Campbell Barton]

Revision: 3540
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-extensions&revision=3540
Author:   campbellbarton
Date:     2012-06-26 11:44:50 +0000 (Tue, 26 Jun 2012)
Log Message:
-----------
rename blender binary so killing it doesnt conflict with other running instances of blender (weak but works)

Modified Paths:
--------------
    trunk/py/scripts/tools/bi_farm/doc/conf.py
    trunk/py/scripts/tools/bi_farm/master_ui.py
    trunk/py/scripts/tools/bi_farm/new_node_update_clear.sh

Modified: trunk/py/scripts/tools/bi_farm/doc/conf.py
===================================================================
--- trunk/py/scripts/tools/bi_farm/doc/conf.py	2012-06-25 18:06:14 UTC (rev 3539)
+++ trunk/py/scripts/tools/bi_farm/doc/conf.py	2012-06-26 11:44:50 UTC (rev 3540)
@@ -92,7 +92,7 @@
 
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
-html_theme = 'default'
+html_theme = 'agogo'
 
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the
@@ -154,7 +154,7 @@
 #html_show_sphinx = True
 
 # If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
-#html_show_copyright = True
+html_show_copyright = False
 
 # If true, an OpenSearch description file will be output, and all pages will
 # contain a <link> tag referring to it.  The value of this option must be the

Modified: trunk/py/scripts/tools/bi_farm/master_ui.py
===================================================================
--- trunk/py/scripts/tools/bi_farm/master_ui.py	2012-06-25 18:06:14 UTC (rev 3539)
+++ trunk/py/scripts/tools/bi_farm/master_ui.py	2012-06-26 11:44:50 UTC (rev 3540)
@@ -441,8 +441,8 @@
             return_file('progressbar%s' % self.path, 'image/png')
         elif self.path.endswith('png'):
             return_file('frames/rrd/%s' % self.path, 'image/png')
-        elif self.path == '/lastframe.html':
-            return_file(os.path.join(FARM_DIR, 'lastframe.html'), 'text/html')
+        elif self.path == '/sllastframe.html':
+            return_file(os.path.join(FARM_DIR, 'slideshow/lastframe.html'), 'text/html')
 
         else:
             # headers

Modified: trunk/py/scripts/tools/bi_farm/new_node_update_clear.sh
===================================================================
--- trunk/py/scripts/tools/bi_farm/new_node_update_clear.sh	2012-06-25 18:06:14 UTC (rev 3539)
+++ trunk/py/scripts/tools/bi_farm/new_node_update_clear.sh	2012-06-26 11:44:50 UTC (rev 3540)
@@ -3,6 +3,7 @@
 PATH=$PATH:$FARM_DIR
 export IP=`ip.sh`
 BUSY=$FARM_DIR/logs/$IP.busy
+BINARY="blender_farm"
 
 echo "Cleaning..." > $BUSY
 
@@ -11,9 +12,7 @@
 
 # ignore error incase 'new_node_command.sh' isn't running
 pkill -P $(pgrep -f new_node_command.sh) 2> /dev/null
+killall -9 $BINARY
 
-#killall -9 blender_farm
-killall -9 blender
-
 rm -rf /tmp/mango_farm*