--- mp3togo/cluster.py

+++ mp3togo/cluster.py

@@ -93,26 +93,12 @@ def slave(opts):

fcntl.fcntl(sys.stdin.fileno(), fcntl.F_SETFL, os.O_NONBLOCK) #Want

- #fcntl.fcntl(sys.stdout.fileno(), fcntl.F_SETFL, os.O_NONBLOCK) #Don't

def initialize(ropts):

"""Integrate remote options into local opts"""

- # of = file('/home/sim/temp/2go/cluster/opts-slave', 'w')

-# for key in ropts.keys():

-# if opts.has_key(key):

-# opts[key] = ropts[key]

-# # of.write("%s: %s\n" % (key, opts[key]))

-# else:

-# return None

- # of.close()

st = ropts['pickle']

opts._d = cPickle.loads(st)

-

opts['verbosity'] = 0

- of = file('/home/sim/temp/2go/cluster/opts-slave', 'w')

- for key in opts.keys():

- of.write("%s: %s\n" % (key, opts[key]))

- of.close()

return "SLAVE: ready"

def perform(rotps):

@@ -222,7 +208,6 @@ class Boss:

if self.pid == 0:

args = r_schema.replace('%h', host)

args += " mp3togo --cluster-slave True"

- #args += " test-mp3togo --cluster-slave True"

args = args.split()

os.execvp(args[0], args)

else:

@@ -245,8 +230,6 @@ class Boss:

def poll(self):

start = 0

last_action = ''

- #for key in self.opts.keys():

- # self.wf.write('%s=%s\n' % (key, self.opts[key]))

optd = self.opts._d.copy()

optd['arg_files'] = []

st = "pickle=" + cPickle.dumps(optd) + '\n'