Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/xzzy/ledger
Browse files Browse the repository at this point in the history
  • Loading branch information
jasondbca committed Aug 20, 2020
2 parents fb0dc48 + dd3c15f commit a5f03dc
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion cron
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#*/2 * * * * root export $(grep -v '^#' /etc/.cronenv | xargs -d '\n') && python /app/manage_ledgergw.py test_email >> /tmp/test_email.log 2>&1
#
*/1 * * * root eval $(grep -v '^#' /etc/.cronenv | xargs -d "\n" -I {} echo export \"{}\" ) && echo "testing" >> /tmp/cron.log
0 4 * * * root eval $(grep -v '^#' /etc/.cronenv | xargs -d "\n" -I {} echo export \"{}\" ) && python manage_ledgergw.py collectbpay /mnt/external/CommBiz_WildlifeLicensing 2>&1 | logger -t wl_collectbpay
0 4 * * * root eval $(grep -v '^#' /etc/.cronenv | xargs -d "\n" -I {} echo export \"{}\" ) && python /app/manage_ledgergw.py collectbpay /mnt/external/CommBiz_WildlifeLicensing 2>&1 | logger -t wl_collectbpay

4 changes: 2 additions & 2 deletions ledger/payments/bpay/facade.py
Original file line number Diff line number Diff line change
Expand Up @@ -286,11 +286,11 @@ def parseFile(file_path):
return success,bpay_file,''
except IntegrityError as e:
success = False
return success,None,e.message
return success,None,str(e)
except Exception as e:
traceback.print_exc()
success = False
return success,None,e.message
return success,None,str(e)
finally:
f.close()

Expand Down

0 comments on commit a5f03dc

Please sign in to comment.