diff --git a/grid.py b/grid.py index e418cfd..8dc23f9 100644 --- a/grid.py +++ b/grid.py @@ -50,7 +50,7 @@ def sync(cached=True): real_slave = { "id":slave_id, "slave":slave_name, "masterip":slave_masterip, "password":decoded_password } optional_slave = {} cache_file = 'cache-slave-' + slave_id + '.json' - prefix = 'cache> [' + slave_name + '] ' + prefix = 'slave[' + slave_name + ']> ' # check if slave is in current region and include it in current dict if it is if slave_regionid == region_id: @@ -60,7 +60,7 @@ def sync(cached=True): proxobject = plugin.auth(slave_id, slave_masterip, enc_slave_password) vmlist = plugin.vmlist(proxobject) real_slave['alive'] = 'up' - logger.info(prefix + 'is up') + logger.info(prefix + 'is online') except: #raise #slave cant be read so it will be marked down. @@ -342,7 +342,7 @@ def query_vm(req_vmid): logger.error('vm[{}]> type is unknown!'.format(vm_id)) raise - logger.info('vm[{}]> type={} path={}'.format(target, vm_type, str(path))) + #logger.info('vm[{}]> type={} path={}'.format(target, vm_type, str(path))) return slave_id, vm_type diff --git a/proxmaster.py b/proxmaster.py index 1009ccc..42f1ff3 100644 --- a/proxmaster.py +++ b/proxmaster.py @@ -19,12 +19,14 @@ import clientsdb config = ioconfig.parser logger = ioconfig.logger + def welcome(): """displays motd in log as welcome message""" logger.info('###################################') logger.info('# proxmaster ][ (c) 2015-2016 afx #') logger.info('###################################') + def apicheck(params): """ compares request params for api key with the config file""" try: @@ -43,6 +45,7 @@ def apicheck(params): finally: return (status, response) + #API methods class Validate(object): def on_post(self, req, resp): @@ -58,7 +61,6 @@ class Validate(object): else: resp.status = falcon.HTTP_403 resp.body = 'ERR' - class ClusterResource(object): @@ -91,6 +93,7 @@ class ClusterResource(object): resp.status = falcon.HTTP_403 resp.body = apicheck_resp + class StatusResource(object): def on_get(self, req, resp, vmid): """ check vm status """ @@ -129,6 +132,7 @@ class DeleteResource(object): resp.status = falcon.HTTP_403 resp.body = apicheck_resp + class ArchivateResource(object): def on_post(self, req, resp, vmid): """ Temporary suspend the instance """ @@ -148,6 +152,7 @@ class ArchivateResource(object): resp.status = falcon.HTTP_403 resp.body = apicheck_resp + class UnArchiveResource(object): def on_post(self, req, resp, vmid): """ Unuspend the instance """ @@ -167,6 +172,7 @@ class UnArchiveResource(object): resp.status = falcon.HTTP_403 resp.body = apicheck_resp + class StartResource(object): def on_post(self, req, resp, vmid): """ Start the instance """