Changeset 6638

Timestamp:

Nov 15, 2016 1:15:34 AM (7 years ago)

Author:

ldelgass

Message:

merge r6630 from nanoscale trunk (timeout for pymolproxy)

Location:

nanoscale/branches/1.0

Files:

• . (modified) (1 prop)
• renderservers.tcl.in (modified) (1 diff)

nanoscale/branches/1.0/renderservers.tcl.in

@@ -86 +86 @@
 #
 register_server pymolproxy 2020 -logstdout 0 -logstderr 0 -combinelogs 0 {
-    ${bindir}/pymolproxy ${bindir}/pymol -p -q -i -x -X 0 -Y 0
+    ${bindir}/pymolproxy -t 43260 -- ${bindir}/pymol -p -q -i -x -X 0 -Y 0
 } {
     PYMOL_SITE_PATH ${libdir}/pymol