diff --git a/direct/src/cluster/ClusterClient.py b/direct/src/cluster/ClusterClient.py index 323b6a9432..d167f660e5 100644 --- a/direct/src/cluster/ClusterClient.py +++ b/direct/src/cluster/ClusterClient.py @@ -20,7 +20,6 @@ class ClusterClient(DirectObject.DirectObject): if clusterDaemonClient == 'None': clusterDaemonClient = os.popen('uname -n').read() clusterDaemonClient = clusterDaemonClient.replace('\n', '') - print 'CLIENT', clusterDaemonClient # What daemon port are we using to communicate between client/servers clusterDaemonPort = base.config.GetInt( 'cluster-daemon-port', CLUSTER_DAEMON_PORT) diff --git a/direct/src/cluster/ClusterMsgs.py b/direct/src/cluster/ClusterMsgs.py index a355f6b9d4..1138d5d037 100644 --- a/direct/src/cluster/ClusterMsgs.py +++ b/direct/src/cluster/ClusterMsgs.py @@ -36,7 +36,7 @@ SERVER_STARTUP_STRING = ( '__builtin__.clusterSyncFlag = %d;' + '__builtin__.clusterDaemonClient = \'%s\';' + '__builtin__.clusterDaemonPort = %d;' - 'from ShowBaseGlobal import *; run()"') + 'from DirectStart import *; run()"') class ClusterMsgHandler: """ClusterMsgHandler: wrapper for PC clusters/multi-piping networking""" diff --git a/direct/src/cluster/ClusterServer.py b/direct/src/cluster/ClusterServer.py index 7e98e8763b..3caa4f46c6 100644 --- a/direct/src/cluster/ClusterServer.py +++ b/direct/src/cluster/ClusterServer.py @@ -148,6 +148,7 @@ class ClusterServer(DirectObject.DirectObject): if (type == CLUSTER_NONE): pass elif (type == CLUSTER_EXIT): + print 'GOT EXIT' import sys sys.exit() elif (type == CLUSTER_CAM_OFFSET):