xoxys/drone-cleanup-agents
Archived
0
0
Fork 0
Code Issues Pull Requests Releases 2 Activity

fix linting issues

Browse Source
This commit is contained in:
Robert Kaussow 2019-12-18 20:40:08 +01:00
parent c646cf35d6
commit dc021e474b
2 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
cleanupagents/Cli.py
View File

@ -5,7 +5,7 @@ import argparse
import json import json
import logging import logging
import os import os
import pickle #nosec import pickle # nosec
import shutil import shutil
import sys import sys
from collections import defaultdict from collections import defaultdict
@ -50,7 +50,7 @@ class AgentCleanup:
config["drone_server"] = os.environ.get("DRONE_SERVER") config["drone_server"] = os.environ.get("DRONE_SERVER")
config["drone_token"] = os.environ.get("DRONE_TOKEN") config["drone_token"] = os.environ.get("DRONE_TOKEN")
config["log_level"] = os.environ.get("DRONE_LOGLEVEL", "WARNING") config["log_level"] = os.environ.get("DRONE_LOGLEVEL", "WARNING")
config["statefile"] = "/tmp/droneclean.pkl" #nosec config["statefile"] = "/tmp/droneclean.pkl" # nosec
config["pending"] = defaultdict(dict, {}) config["pending"] = defaultdict(dict, {})
if os.path.isfile(binary): if os.path.isfile(binary):
@ -72,7 +72,7 @@ class AgentCleanup:
if os.path.isfile(config["statefile"]): if os.path.isfile(config["statefile"]):
with open(config["statefile"], "rb") as json_file: with open(config["statefile"], "rb") as json_file:
config["pending"] = pickle.load(json_file) #nosec config["pending"] = pickle.load(json_file) # nosec
return config return config
@ -110,16 +110,14 @@ class AgentCleanup:
self.logger.info("Stopping '{agent}' ({triage}/3) {force}".format( self.logger.info("Stopping '{agent}' ({triage}/3) {force}".format(
agent=e, triage=control[e] or 3, force=force_msg)) agent=e, triage=control[e] or 3, force=force_msg))
#res = run_command( res = run_command("drone -s {server} -t {token} --autoscaler {scaler} server destroy {force} {agent}".format(
# "drone -s {server} -t {token} --autoscaler {scaler} server destroy {force} {agent}".format( server=self.config["drone_server"], token=self.config["drone_token"], scaler=scaler, agent=e, force=force))
# server=self.config["drone_server"], token=self.config["drone_token"], scaler=scaler, agent=e, force=force
#))
#if res.returncode > 0: if res.returncode > 0:
# self.log.sysexit_with_message("Command error:\n{}".format(humanize(res.stdout))) self.log.sysexit_with_message("Command error:\n{}".format(humanize(res.stdout)))
with open(self.config["statefile"], "wb") as json_file: with open(self.config["statefile"], "wb") as json_file:
pickle.dump(control, json_file) #nosec pickle.dump(control, json_file) # nosec
def run(self): def run(self):
try: try:

4
cleanupagents/Utils.py
View File

@ -3,7 +3,7 @@
import os import os
import shlex import shlex
import subprocess #nosec import subprocess # nosec
import sys import sys
from distutils.util import strtobool from distutils.util import strtobool
@ -19,7 +19,7 @@ def to_bool(string):
def run_command(command): def run_command(command):
cmd = [x.strip() for x in shlex.split(command)] cmd = [x.strip() for x in shlex.split(command)]
p = subprocess.run(cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT) #nosec p = subprocess.run(cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT) # nosec
return p return p