@@ -151,7 +151,7 @@ def connect_input(input): host = this_host() if input.startswith("chunkfile://"): is_chunk = True - local_file = input[12:] + local_file = LOCAL_PATH + input[12:] elif input.startswith("file://"): local_file = input[7:] else: node/disconode/disco_worker.py @@ -1,7 +1,20 @@ import os, sys, imp, cStringIO from disco.netstring import decode_netstring_fd -from disco.core import Job, result_iterator -from disconode import disco_worker +from disco.core import Job, result_iterator, util + +def parse_dir(dir): + x, x, LOCAL_PATH = util.load_conf() + x, x, x, mode, path = dir.split("/", 4) + res = [] + for f in os.listdir(LOCAL_PATH + path): + if not (f.startswith(mode) or "." in f): + continue + proto = f.split("-")[1] + if proto == "chunk": + res.append("chunkfile://%s%s" % (path, f)) + elif proto == "disco": + res.append("disco://localhost/%s%s" % (path, f)) + return res class MsgStream: def __init__(self): @@ -9,11 +22,7 @@ class MsgStream: def write(self, msg): if msg.startswith("**<OUT>"): addr = msg.split()[-1] - fname = "/".join(addr.split("/")[-2:]) - if addr.startswith("chunk://"): - self.out.append("chunkfile://data/" + fname) - else: - self.out.append("file://data/" + fname) + self.out = parse_dir(addr) print msg, class DummyDisco: @@ -32,9 +41,11 @@ class HomeDisco: argv_backup = sys.argv[:] out_backup = sys.stderr - sys.argv = ["", "", "", "localhost", "", self.partition] + sys.argv = ["", "", job.name, "localhost", + "http://nohost", self.partition] sys.argv += kwargs["input"] - disco_worker.job_name = job.name + + from disconode import disco_worker sys.stderr = out = MsgStream() try: util/homedisco.py db80c590394eaf327912f60057ba2503ebc751f5 Ville Tuulos tuulos@nxfront.nokiapaloalto.com http://github.com/tuulos/disco/commit/caf78f7735673140d15cdc9e9aa1d990248a99b2 caf78f7735673140d15cdc9e9aa1d990248a99b2 2009-05-26T00:56:53-07:00 2009-05-26T00:56:53-07:00 bugfix: fixed homedisco regression in 0.2. Closes #5. Closes #10 c0c5e85ee04696f5defe4fde73e461744083c39b Ville Tuulos tuulos@nxfront.nokiapaloalto.com