Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 8 additions & 10 deletions jeeves_commons/storage/storage.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,19 +27,17 @@ def create(self, wf_id, content, env):
workflow = self._create_workflow(wf_id, content, env)
return workflow

def get(self, workflow_id):
workflow = self._get(Workflow, workflow_id=workflow_id)
if not workflow:
raise WorkflowDoesNotExistError('Workflow with id {} not found.'
.format(workflow_id))
def get(self, workflow_id, **kwargs):
workflow = self._get(Workflow, workflow_id=workflow_id, **kwargs)
return workflow

def update(self, wf_id,
status=None,
env_result=None,
date_done=None,
started_at=None):
started_at=None,):
workflow = self.get(wf_id)
# Change to kwargs!!
workflow = self._update_workflow(workflow,
status,
env_result,
Expand All @@ -48,8 +46,8 @@ def update(self, wf_id,
# Return the new, updated workflow
return workflow

def delete(self, wf_id):
workflow = Workflow.query.filter_by(workflow_id=wf_id)
def delete(self, wf_id, **kwargs):
workflow = self.get(wf_id, **kwargs)
# Todo: remove all associated tasks.
# self._delete_all_tasks(workflow.id)
if not workflow:
Expand Down Expand Up @@ -171,8 +169,8 @@ def _create_task(self,

class MinionClient(BaseStorage):

def get(self, minion_ip):
return self._get(Minion, minion_ip=minion_ip)
def get(self, minion_ip, **kwargs):
return self._get(Minion, minion_ip=minion_ip, **kwargs)

def list(self, **kwargs):
return self._list(Minion, **kwargs)
Expand Down
7 changes: 4 additions & 3 deletions jeeves_commons/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,21 +47,22 @@ def wait_for_port(host, port, duration=60, interval=3):
def create_logger(name, path=None, level=logging.DEBUG):
logger = logging.getLogger(name)
if path:
logger.addHandler(_create_file_handler(logger, path))
logger.addHandler(_create_file_handler(path))
logger.addHandler(logging.StreamHandler())
logger.level = level
return logger


def _create_file_handler(logger, path):

def _create_file_handler(path):
_make_dir(path)
return logging.FileHandler(path)


def get_or_create_file_logger(name, path):
logger = logging.getLogger(name)
if len(logger.handlers) == 0:
logger.addHandler(_create_file_handler(logger, path))
logger.addHandler(_create_file_handler(path))
return logger


Expand Down