Skip to content

Commit

Permalink
Merge #1129: Fix tumble log dir after load_program_config
Browse files Browse the repository at this point in the history
a1bcac9 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 a1bcac9

Tree-SHA512: 69085ef50bdbe6a7f420df8c9384e21855df1fdad377b968714b70cefed4db558a66d7afc4f8cba1efd8dc41447564578c466d9d7ebea3b1a2cef9a4d7b069a2
  • Loading branch information
kristapsk committed Dec 28, 2021
2 parents dd09025 + a1bcac9 commit 7d1c4eb
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions scripts/tumbler.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,18 @@
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)
if len(args) < 1:
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")
Expand Down

0 comments on commit 7d1c4eb

Please sign in to comment.