ArielGlenn has submitted this change and it was merged.
Change subject: cleanup unused function, unneeded special class instantiations
......................................................................
cleanup unused function, unneeded special class instantiations
Change-Id: Ida9bfc14000152f6eb3fcebdffb8dd071a56d2f9
---
M dataretention/retention/examiner.py
M dataretention/retention/utils.py
2 files changed, 6 insertions(+), 13 deletions(-)
Approvals:
ArielGlenn: Verified; Looks good to me, approved
diff --git a/dataretention/retention/examiner.py
b/dataretention/retention/examiner.py
index cd559c8..8d8dc1f 100644
--- a/dataretention/retention/examiner.py
+++ b/dataretention/retention/examiner.py
@@ -6,7 +6,8 @@
sys.path.append('/srv/audits/retention/scripts/')
-from retention.saltclientplus import LocalClientPlus
+from salt.client import LocalClient
+#from retention.saltclientplus import LocalClientPlus
import retention.utils
from retention.utils import JsonHelper
from retention.fileinfo import FileInfo, EntryInfo
@@ -29,7 +30,8 @@
'''
do all the work
'''
- client = LocalClientPlus()
+# client = LocalClientPlus()
+ client = LocalClient()
module_args = [self.path,
self.num_lines,
self.timeout]
@@ -210,7 +212,8 @@
'''
while True:
- client = LocalClientPlus()
+# client = LocalClientPlus()
+ client = LocalClient()
module_args = [self.path, self.batchno,
self.batchsize, self.timeout,
quiet]
diff --git a/dataretention/retention/utils.py b/dataretention/retention/utils.py
index 97f7f7e..c27bea7 100644
--- a/dataretention/retention/utils.py
+++ b/dataretention/retention/utils.py
@@ -17,16 +17,6 @@
hosts = hosts_expr
return hosts, 'glob' # default
-def running_locally(hosts_expr):
- '''
- determine whether this script is to run on the local
- host or on one or more remote hosts
- '''
- if hosts_expr == "127.0.0.1" or hosts_expr == "localhost":
- return True
- else:
- return False
-
class JsonHelper(object):
# adapted from
--
To view, visit https://gerrit.wikimedia.org/r/233464
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ida9bfc14000152f6eb3fcebdffb8dd071a56d2f9
Gerrit-PatchSet: 2
Gerrit-Project: operations/software
Gerrit-Branch: master
Gerrit-Owner: ArielGlenn <[email protected]>
Gerrit-Reviewer: ArielGlenn <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
