Skip to content

Avoid shell for local file moves #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Asylian21 wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Avoid shell for local file moves #29

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions bmon/bitcoind_tasks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ def mempool_activity(avro_data: dict, linehash: str):
def queue_mempool_to_ship():
now_str = datetime.datetime.now().isoformat()
shipfile = settings.MEMPOOL_ACTIVITY_CACHE_PATH / f"to-ship.{now_str}.avro"
subprocess.check_call(f"mv {CURRENT_MEMPOOL_FILE} {shipfile}", shell=True)
CURRENT_MEMPOOL_FILE.replace(shipfile)
log.info(
"moved mempool activity file %s to %s for shipment",
CURRENT_MEMPOOL_FILE,
Expand Down Expand Up @@ -288,7 +288,7 @@ def ship_mempool_activity():
d.upload_from_filename(shipfile)

moved = settings.MEMPOOL_ACTIVITY_CACHE_PATH / f"shipped.{timestr}.avro"
subprocess.check_call(f"mv {shipfile} {moved}", shell=True)
shipfile.replace(moved)
log.info("pushed mempool activity %s to Chaincode GCP", shipfile)
except Exception:
mempool_ship_lock.release()
Expand Down Expand Up @@ -328,7 +328,7 @@ def get_latest_host() -> models.Host:
def create_host_record():
def get_lshw(classn: str) -> dict:
return json.loads(
subprocess.check_output(f"lshw -json -class {classn}", shell=True)
subprocess.check_output(["lshw", "-json", "-class", classn])
)[0]

bitcoin_version = bitcoin.api.read_raw_bitcoind_version()
Expand Down