From 79f284a0a9600d48b48e6fbe7083d5a612af6718 Mon Sep 17 00:00:00 2001 From: "Joshua M. Boniface" Date: Tue, 18 Jun 2019 13:45:59 -0400 Subject: [PATCH] Pass logger into run_command --- node-daemon/pvcd/CephInstance.py | 2 +- node-daemon/pvcd/Daemon.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/node-daemon/pvcd/CephInstance.py b/node-daemon/pvcd/CephInstance.py index 5a29e6d0..221a797a 100644 --- a/node-daemon/pvcd/CephInstance.py +++ b/node-daemon/pvcd/CephInstance.py @@ -417,7 +417,7 @@ def remove_pool(zk_conn, logger, name): logger.out('Failed to remove RBD pool {}: {}'.format(name, e), state='e') return False -def run_command(zk_conn, this_node, data, d_osd): +def run_command(zk_conn, logger, this_node, data, d_osd): # Get the command and args command, args = data.split() diff --git a/node-daemon/pvcd/Daemon.py b/node-daemon/pvcd/Daemon.py index cc44b49a..832ecd47 100644 --- a/node-daemon/pvcd/Daemon.py +++ b/node-daemon/pvcd/Daemon.py @@ -792,7 +792,7 @@ if enable_storage: @zk_conn.DataWatch('/ceph/cmd') def cmd(data, stat, event=''): if data: - CephInstance.run_command(zk_conn, this_node, data.decode('ascii'), d_osd) + CephInstance.run_command(zk_conn, logger, this_node, data.decode('ascii'), d_osd) # OSD objects @zk_conn.ChildrenWatch('/ceph/osds')