Browse Source

Merge JoinMarket-Org/joinmarket-clientserver#1129: Fix tumble log dir after load_program_config

a1bcac99cc Fix tumble log dir after load_program_config (Adam Gibson)

Pull request description:

  Fixes #1060.
  Prior to this commit, the extra log for tumbler.py
  was created in the local directory, because it was
  set before running load_program_config (which defaults
  to the user's default joinmarket config location), this
  is now corrected.

ACKs for top commit:
  kristapsk:
    ACK a1bcac99cc

Tree-SHA512: 69085ef50bdbe6a7f420df8c9384e21855df1fdad377b968714b70cefed4db558a66d7afc4f8cba1efd8dc41447564578c466d9d7ebea3b1a2cef9a4d7b069a2
master
Kristaps Kaupe 4 years ago
parent
commit
7d1c4ebf30
No known key found for this signature in database
GPG Key ID: 33E472FE870C7E5D
  1. 7
      scripts/tumbler.py

7
scripts/tumbler.py

@ -17,12 +17,8 @@ from jmbase.support import get_log, jmprint, EXIT_SUCCESS, \
EXIT_FAILURE, EXIT_ARGERROR
log = get_log()
logsdir = os.path.join(os.path.dirname(
jm_single().config_location), "logs")
def main():
tumble_log = get_tumble_log(logsdir)
(options, args) = get_tumbler_parser().parse_args()
options_org = options
options = vars(options)
@ -30,6 +26,9 @@ def main():
jmprint('Error: Needs a wallet file', "error")
sys.exit(EXIT_ARGERROR)
load_program_config(config_path=options['datadir'])
logsdir = os.path.join(os.path.dirname(
jm_single().config_location), "logs")
tumble_log = get_tumble_log(logsdir)
if jm_single().bc_interface is None:
jmprint('Error: Needs a blockchain source', "error")

Loading…
Cancel
Save