Commit 1cb8e282 authored by Cristiano Urban's avatar Cristiano Urban
Browse files

Code cleanup.

parent dc0684da
Loading
Loading
Loading
Loading
+6 −6
Original line number Diff line number Diff line
@@ -11,12 +11,12 @@ class VOSData(RedisRPCClient):

    def __init__(self):
        config = Config("/etc/vos_cli/vos_cli.conf")
        self.params = config.loadSection("server")
        self.host = self.params["host"]
        self.port = self.params.getint("port")
        self.db = self.params.getint("db")
        self.params = config.loadSection("vos_data")
        self.rpcQueue = self.params["rpc_queue"]
        params = config.loadSection("server")
        self.host = params["host"]
        self.port = params.getint("port")
        self.db = params.getint("db")
        params = config.loadSection("vos_data")
        self.rpcQueue = params["rpc_queue"]
        super(VOSData, self).__init__(self.host, self.port, self.db, self.rpcQueue)

    def help(self):
+6 −6
Original line number Diff line number Diff line
@@ -11,12 +11,12 @@ class VOSImport(RedisRPCClient):

    def __init__(self):
        config = Config("/etc/vos_cli/vos_cli.conf")
        self.params = config.loadSection("server")
        self.host = self.params["host"]
        self.port = self.params.getint("port")
        self.db = self.params.getint("db")
        self.params = config.loadSection("vos_import")
        self.rpcQueue = self.params["rpc_queue"]
        params = config.loadSection("server")
        self.host = params["host"]
        self.port = params.getint("port")
        self.db = params.getint("db")
        params = config.loadSection("vos_import")
        self.rpcQueue = params["rpc_queue"]
        super(VOSImport, self).__init__(self.host, self.port, self.db, self.rpcQueue)

    def load(self, path, username):
+6 −6
Original line number Diff line number Diff line
@@ -12,12 +12,12 @@ class VOSJob(RedisRPCClient):

    def __init__(self):
        config = Config("/etc/vos_cli/vos_cli.conf")
        self.params = config.loadSection("server")
        self.host = self.params["host"]
        self.port = self.params.getint("port")
        self.db = self.params.getint("db")
        self.params = config.loadSection("vos_job")
        self.rpcQueue = self.params["rpc_queue"]
        params = config.loadSection("server")
        self.host = params["host"]
        self.port = params.getint("port")
        self.db = params.getint("db")
        params = config.loadSection("vos_job")
        self.rpcQueue = params["rpc_queue"]
        self.jobPhases = ("pending", "queued", "executing", "completed", "error")
        super(VOSJob, self).__init__(self.host, self.port, self.db, self.rpcQueue)

+6 −6
Original line number Diff line number Diff line
@@ -11,12 +11,12 @@ class VOSStorage(RedisRPCClient):

    def __init__(self):
        config = Config("/etc/vos_cli/vos_cli.conf")
        self.params = config.loadSection("server")
        self.host = self.params["host"]
        self.port = self.params.getint("port")
        self.db = self.params.getint("db")
        self.params = config.loadSection("vos_storage")
        self.rpcQueue = self.params["rpc_queue"]
        params = config.loadSection("server")
        self.host = params["host"]
        self.port = params.getint("port")
        self.db = params.getint("db")
        params = config.loadSection("vos_storage")
        self.rpcQueue = params["rpc_queue"]
        super(VOSStorage, self).__init__(self.host, self.port, self.db, self.rpcQueue)

    def add(self):