LBRYCommunity/lbry-sdk
1
0
Fork 1
Code Issues Pull requests Projects Releases 282 Packages Wiki Activity
1018 commits 110 branches 641 tags 31 MiB
Commit graph

696 commits

Author SHA1 Message Date
Job Evers-Meltzer
e69de47daf refactor wait_on_write stopping condition 2016-08-05 11:37:24 -05:00
Job Evers-Meltzer
acef10e848 fix merge oversight 2016-08-05 11:37:24 -05:00
Job Evers
edb9d50d9e fix typo in docstring 2016-08-05 11:37:24 -05:00
Job Evers
b989d4f6be Bug fix: correct the check on wait_or_get_stream 
I reversed the check on lbry_file. Compare to the original code:
e67f55bd74/lbrynet/lbrynet_daemon/LBRYDaemon.py (L1119)
 2016-08-05 11:37:24 -05:00
Job Evers
84dd5c0eca Revert "revert get() refactor" 
This reverts commit 5eb7c64ec3.
 2016-08-05 11:37:24 -05:00
Job Evers-Meltzer
db8daf20b7 quiet noisy log statement 2016-08-05 05:50:24 -05:00
Jack
cb985b5a03 log conditions of lbry_file failing to start 2016-08-04 23:27:44 -04:00
Jack
28c4e38272 make line neater 2016-08-04 23:27:25 -04:00
Jack
b29377dc2b keep claim id history 2016-08-04 23:27:10 -04:00
Jack
ca09592a72 make logs easier to scroll through 2016-08-04 23:10:15 -04:00
Jack
b0e14fae43 update over existing claim in publish() 2016-08-04 23:08:54 -04:00
Jack
dfa68f126b get update_name in lbrycrdwallet working 2016-08-04 20:43:39 -04:00
Jack
4570f68727 add claim_id to lbry_file and to get_claim_info 2016-08-04 18:44:12 -04:00
Jack
4705acba55 use lbryum updateclaim 2016-08-04 02:22:10 -04:00
Jimmy Kiselak
1dea20a358 include sd blob hashes in list of blob hashes to send via reflector 2016-08-03 23:11:29 -04:00
Jimmy Kiselak
191f661b35 skeleton for reflector protocol 2016-08-03 23:03:14 -04:00
Jack
f3ab38ba8f Bump version: 0.3.12 -> 0.3.13 2016-08-03 18:01:18 -04:00
Jack
f68fd96555 break out sd timeout into a variable 2016-08-03 17:57:26 -04:00
Jack
fc50a3242f add note about request.notifyFinish 2016-08-03 17:49:13 -04:00
Jack
64e9ce2bfa comments about the upnp redirects 2016-08-03 17:44:41 -04:00
Jack
e8d04b1921 specify a lighthouse server 2016-08-03 17:44:32 -04:00
Jack
9fedf14e55 request.notifyFinish 2016-08-03 12:46:46 -04:00
David Amrhein
7d535ef7d1 Make ca_path checks for frozen windows only 2016-08-03 10:16:14 -04:00
Jack
85d610bcdf add get_peers_for_hash 2016-08-03 03:16:06 -04:00
Jack
3af8b7bd0c use upnp redirects if they're already set 2016-08-03 01:27:40 -04:00
Jack
6215d85581 add LighthouseClient, announce sd hash after publishing 2016-08-02 18:34:48 -04:00
Jack
308d9f5abd add todo 2016-08-02 17:33:57 -04:00
Jack
bcfabba038 fast search 
use cost from lighthouse
 2016-08-02 16:45:06 -04:00
Jack
69139b1987 already called error 2016-08-02 16:03:47 -04:00
Jack
3f8f9d9d73 add timeout to download_sd_blob 2016-08-02 02:54:04 -04:00
Jack
2283579109 reorganize download_descriptor 2016-08-01 23:15:32 -04:00
Jack
1e0af94ba2 add download_descriptor 2016-08-01 22:31:49 -04:00
David Amrhein
cca2a57c69 Set cacert environ path for windows distribution 2016-07-30 22:52:49 -04:00
David Amrhein
3f95c1a9d5 Skip db migration in windows 2016-07-30 17:09:38 -04:00
David Amrhein
7bd05e9b16 Handle creation of settings directory in windows 2016-07-30 17:09:15 -04:00
Jack
bbf7940e45 Bump version: 0.3.11 -> 0.3.12 2016-07-29 23:44:04 -04:00
Jack
1ffcd67c9d specify exception 2016-07-29 23:05:01 -04:00
Jack
cf8592ba12 docstring and todo 2016-07-29 22:49:50 -04:00
Jack
1e1d036590 clean log line 2016-07-29 22:44:38 -04:00
Jack
64afb6d305 clean up get_est_costs in search 2016-07-29 22:43:50 -04:00
Jack
20a9e018f7 revert updates to git 2016-07-29 22:36:30 -04:00
Jack
a574c33ac6 multiple search servers 2016-07-29 21:37:44 -04:00
Jack
d21e458fe1 remove debug line 2016-07-29 02:42:58 -04:00
Jack
bb3ba53c6e fix search results 2016-07-28 22:39:34 -04:00
Jack
ba2e4df76b remove debug stuff 2016-07-28 21:31:19 -04:00
Jack
33e7e4bee3 fancy search 2016-07-28 21:25:37 -04:00
Jack
b83dce2cb3 no tricky characters 2016-07-28 18:48:29 -04:00
Jack
6821676853 handle decimals in jsonrpc return 2016-07-28 18:12:54 -04:00
Jack
52024986ee derp 2016-07-28 16:32:59 -04:00
Jack
2e3342d20d fix test 2016-07-28 16:27:16 -04:00
Jack
419aa1d78f fix est data cost / search 2016-07-28 16:12:20 -04:00
Jack
de4ddd578f improve readability of metadata and fee requirements 2016-07-28 15:24:20 -04:00
Jack
5dd68a7ed4 add get_claim_info, clean up _get_stream_info_from_value 2016-07-28 14:55:17 -04:00
Jack
881168dc7a fix too many args 2016-07-28 13:16:33 -04:00
Job Evers-Meltzer
295e427abe bug fix: check if fee is in metadata before loading 2016-07-28 12:04:25 -05:00
Job Evers
67c5d15f51 stupid typo 2016-07-28 11:46:33 -05:00
Job Evers
39a7f37f35 muck with pending_claims... still not sure this is correct 2016-07-28 11:43:47 -05:00
Job Evers
15d276b0bc fix case where to and from currencies are the same 2016-07-28 11:43:20 -05:00
Jack
4387025c48 another still 2016-07-28 06:07:33 -04:00
Jack
52c20f02c7 one more 2016-07-28 06:03:47 -04:00
Jack
413dab8094 whoops 2016-07-28 05:59:10 -04:00
Jack
6b1d11a04d fix rate in test 2016-07-28 05:53:31 -04:00
Jack
5441379f38 fix LBRYExchangeRateManager test 2016-07-28 05:49:31 -04:00
Jack
52d954c64e don't spam the market apis 2016-07-28 05:34:20 -04:00
Jack
415495fc16 LBRYExchangeRateManager 2016-07-28 05:30:13 -04:00
Jack
12b2bbfa26 make sure claimed ver is true 2016-07-28 02:36:07 -04:00
Jack
4ade80c8a9 clean up metadata and fee 2016-07-28 02:19:45 -04:00
Jack
9674381fc2 Merge remote-tracking branch 'origin/metadata-version-avec-tests' into metadata-version 2016-07-27 20:18:00 -04:00
Jack
f6d91280d7 remove debug print line 2016-07-27 15:03:03 -04:00
Jack
e4ebbd8f69 neater force param in resolve_name 2016-07-27 15:02:54 -04:00
Jack
7f5560de6d comment spacing and removing setLevel 2016-07-27 15:02:19 -04:00
Job Evers-Meltzer
0925171e07 bug fix: use txid attribute, not key 2016-07-27 13:59:26 -05:00
Job Evers-Meltzer
900d3ad01d Fixes errback not being callable 
Small code refactoring to make it more obvious what
both the callback and errback are doing
 2016-07-27 13:12:20 -05:00
Job Evers-Meltzer
0f602e0e62 allow bittrex fee to be changed 2016-07-27 11:59:57 -05:00
Jack
3a425fc47d Merge branch 'master' into metadata-version 2016-07-27 05:07:23 -04:00
Jack
36722cbbd8 Bump version: 0.3.10 -> 0.3.11 2016-07-27 03:58:25 -04:00
Jack
9572336e96 Merge branch 'master' into metadata-version 
# Conflicts:
#	lbrynet/core/utils.py
#	lbrynet/lbrynet_daemon/LBRYDaemon.py
 2016-07-27 03:54:10 -04:00
Jack
4895cde474 fix conflicts 2016-07-27 03:48:32 -04:00
Jack Robison
21ca1a73cf Merge pull request #100 from lbryio/change-ui-location 
web-ui files are on S3 now
 2016-07-27 03:44:28 -04:00
Jack Robison
457c1c6ae6 Merge pull request #101 from lbryio/version-cmp 
Properly Compare Version Strings
 2016-07-27 03:43:13 -04:00
Jack Robison
c1ff127101 Merge pull request #102 from lbryio/log-configure 
Fix: Log configuration should not happen when a module is imported
 2016-07-27 03:42:51 -04:00
Jack
5e815a5832 merge master 2016-07-27 03:22:03 -04:00
Jack
4604e9cd54 check pending claims after one is made 2016-07-27 03:00:44 -04:00
Jack
ef580a7680 errback for pending of date lbry_file 2016-07-27 01:51:09 -04:00
Jack
2102776be8 another errback 2016-07-27 01:44:01 -04:00
Jack
f3af7a6b77 add errback for unknown name 2016-07-27 01:39:23 -04:00
Jack
5abeceac1f abandon previous claim in update 2016-07-27 01:13:41 -04:00
Jack
22f73a0817 add force parameter to resolve_name 2016-07-26 21:46:04 -04:00
Jack
29b5aef73a call restore() after claiming name 2016-07-26 21:24:58 -04:00
Jack
3e602bce52 fix publish callback 2016-07-26 20:58:37 -04:00
Jack
fe39901885 update claim when publishing to an already claimed name 
-also save name_metadata for each unique claim rather than for each name
 2016-07-26 20:52:05 -04:00
Jack
ee9e8b365c add debug log line 2016-07-26 18:42:51 -04:00
Jack
bd6fa35d4a disable verbose dht error 2016-07-26 18:19:40 -04:00
Jack
5e1fdf66b0 fix download problem 2016-07-26 18:18:34 -04:00
Jack
d86e709b90 reduce min blob prices 2016-07-26 17:24:59 -04:00
Jack
f82cffe882 verbose logging 2016-07-26 17:21:41 -04:00
Jack
3d88eb92c1 change default max fee to $25 2016-07-26 17:21:03 -04:00
Jack
0811ebb52d fix key payment problems 2016-07-26 17:20:51 -04:00
Jack
491d431ea5 remove price updater from daemon 2016-07-26 17:19:26 -04:00
Job Evers‐Meltzer
ceeebebcad Merge pull request #106 from lbryio/no-blobs-in-logs 
Have TimeoutError hexlify blobs
 2016-07-26 14:57:30 -05:00
Job Evers‐Meltzer
04d766aba7 Merge pull request #105 from lbryio/bug-fixes 
misc bug fixes and code cleanup
 2016-07-26 14:56:50 -05:00
Job Evers‐Meltzer
3b431e180e Merge pull request #98 from lbryio/log-cleanup 
Remove datetime.now() from log statements
 2016-07-26 14:54:36 -05:00
Job Evers
a2eab1577d Have TimeoutError hexlify blobs 2016-07-26 13:54:46 -05:00
Job Evers-Meltzer
f8dd3d05dc misc bug fixes and code cleanup 2016-07-26 12:24:25 -05:00
Job Evers-Meltzer
93993e62d6 Fix: Log configuration should not happen when a module is imported 
Instead, move the responsibility to the main program. Also,
each module had the same, redundant setup.
 2016-07-26 12:01:03 -05:00
Job Evers
4a1e846958 Remove print line 
This line is responsible for flooding the console with messages like
<_io.BytesIO object at 0x7f9e286e52f0>
 2016-07-26 11:34:13 -05:00
Jack
9e8827f015 resolve name bug 2016-07-25 23:46:18 -04:00
Jack
ca45f461ae spelling 2016-07-25 23:42:03 -04:00
Jack
7e5af11c2d fix key fee payment problem 2016-07-25 23:41:26 -04:00
Jack
102436274f USD denominated max_key_fee in settings 2016-07-25 22:46:04 -04:00
Jack
49c26a76b4 remove fee checking from autofetcher script 2016-07-25 22:28:01 -04:00
Jack
a5374cb876 fix currencies and LBRYFeeFormat 2016-07-25 22:17:31 -04:00
Jack
a53e911a0c stop looping call when stop() is called 2016-07-25 21:48:39 -04:00
Jack
c4a78a149b LBRYFee things 
-move exchange rate updates to wallet, do them every half hour
-add convention checker for fees
-pay BTC or USD denominated key fees in converted LBC amount
 2016-07-25 21:45:42 -04:00
Job Evers-Meltzer
3814912adf Move to core.utils and expand to check lbryum too 2016-07-25 16:09:13 -05:00
Job Evers-Meltzer
d0bc383a79 bug fix: version comparison is not lexographic. 
Use distutils.version to compare version strings.
 2016-07-25 12:25:10 -05:00
Job Evers-Meltzer
ea5d31b530 OCD: alphabetize and group imports 
I'm not the only one:
https://google.github.io/styleguide/pyguide.html?showone=Imports_formatting#Imports_formatting
 2016-07-25 12:19:19 -05:00
Job Evers
ed393eb75c Updates the deployment process and the version check associated with it 
This commit supports steps 1 and 2 in the new workflow:
1. Change the logic in the daemon to check the github api for the latest release that is not a pre release
2. Change travis to mark all releases as pre release
3. When we are ready to stage a release we push a tag to master. Travis builds the packages and releases them
4. We manually check them
5. Remove the pre release mark when we are happy
 2016-07-25 11:13:47 -05:00
Jack
2e2d309d38 BTC/USD denominated fees, metadata revisions 2016-07-25 01:40:26 -04:00
Jack
6bfb33adb2 fix version comparison 2016-07-24 22:03:32 -04:00
Job Evers-Meltzer
05138e1db1 web-ui files are on S3 now 2016-07-22 10:58:37 -05:00
Jack
b65402db41 debug line 2016-07-21 16:47:47 -04:00
Jack
fbef187400 Merge branch 'master' into metadata-version 
# Conflicts:
#	lbrynet/conf.py
#	lbrynet/lbrynet_daemon/LBRYDaemon.py
 2016-07-21 16:45:41 -04:00
Jack
25d1b8b9e5 move towards better fees and metadata 2016-07-21 16:11:14 -04:00
Job Evers
ec91594083 Remove datetime.now() from log statements 2016-07-21 10:41:26 -05:00
Jack
e67f55bd74 disable debug logging 2016-07-20 22:40:55 -04:00
Jack Robison
276a7f9d2a Merge pull request #92 from lbryio/file-uploads 
Add support for file uploads (for Publish page)
 2016-07-20 22:37:08 -04:00
Jack
4888d7a567 Bump version: 0.3.9 -> 0.3.10 2016-07-20 22:34:16 -04:00
Jack
4311b218fb fix auto_connect 2016-07-20 22:13:22 -04:00
Jack
89892042dd remove unused line 2016-07-20 20:57:05 -04:00
Jack
a22dfb3864 cleaner logging 
from https://github.com/lbryio/lbry/pull/94
 2016-07-20 20:56:56 -04:00
Jack
f40c42dcf0 Merge branch 'master' into lbryum-catchup 2016-07-20 20:38:42 -04:00
Jack
1d31aa9da3 Bump version: 0.3.8 -> 0.3.9 2016-07-20 20:34:41 -04:00
Jack
f999073fb4 revert download refactor 
to be re-merged after fixes
 2016-07-20 20:34:02 -04:00
Jack
5eb7c64ec3 revert get() refactor 2016-07-20 20:30:57 -04:00
Jack
7e79818555 Revert "Merge branch 'master' into lbryum-catchup" 
This reverts commit a51576b250, reversing
changes made to 0bee2689d1.
 2016-07-20 20:24:49 -04:00
Jack
a51576b250 Merge branch 'master' into lbryum-catchup 2016-07-20 20:17:08 -04:00
Jack
0bee2689d1 download fixes 2016-07-20 20:17:01 -04:00
Jack
c232743963 fix LBRYumWallet._do_send_many 2016-07-20 20:13:44 -04:00
Jack
8e8e186de9 Merge branch 'master' into lbryum-catchup 2016-07-20 19:29:11 -04:00
Jack
55f47a2b1b lbryum catchup 2016-07-20 17:32:15 -04:00
Job Evers-Meltzer
5c27b9eb90 use asctime in logging format 
Instead of manually adding datetime.now() use
asctime formatter to do it for us.
 2016-07-20 07:21:12 -05:00
Job Evers‐Meltzer
34b8841f5c Merge pull request #73 from lbryio/refactor-dl-name 
Refactor jsonrpc_get, _download_name, _resolve_name
 2016-07-20 07:07:02 -05:00
Alex Liebowitz
a54166a27c Add support for file uploads (for Publish page) 2016-07-20 02:36:55 -04:00
Job Evers
4adec39dce Bump version: 0.3.7 -> 0.3.8 2016-07-18 16:00:52 -05:00
Job Evers-Meltzer
78b4b3ffa8 revert default wallet back to lbryum 2016-07-18 11:30:21 -05:00
Job Evers-Meltzer
5ebcc01bcc Bump version: 0.3.6 -> 0.3.7 2016-07-17 14:10:11 -05:00
Job Evers-Meltzer
8ec10e2304 emergency fix: force lbrycrd to be the default wallet 
Ignore save settings for wallet type and use the default wallet (lbrycrd)
instead.  lbryum can be used but only if specified on the command line.
 2016-07-17 13:45:26 -05:00
Job Evers-Meltzer
172f275bc7 Refactor _resolve_name. 
Continue using the delegation/helper pattern for the daemon.
 2016-07-16 09:24:27 -05:00
Jack
2dcd2b13be add LBRYMetadata.py 2016-07-15 14:09:43 -04:00
Job Evers-Meltzer
a15d7ca543 Refactor _download_name 
Nested functions are the devil, especially ones that
use variables from the outer scope. Refactoring
_download_name to use a helper class helps make
the scoping more explicit and will undoubtably
prevent bugs in the future.

I think this makes _download_name drastically more readable.

Also cleaned up some duplicated code and
made download_directory respect the passed in parameter
instead of being the default.
 2016-07-15 12:42:26 -05:00
Job Evers-Meltzer
a90029ec50 update doc string 2016-07-15 11:37:04 -05:00
Job Evers-Meltzer
563896b126 fix bug in reveal code 2016-07-15 11:33:38 -05:00
Job Evers-Meltzer
5aecd02668 Refactor jsonrpc_get. 
Move parameter handling into its own function and
better use the `.get()` function for dictionaries.

Early return on the failed checks is more readable.

The lambda function in the callback was long and
hard to read so moved it out.
 2016-07-15 11:32:46 -05:00
Job Evers‐Meltzer
842dd90780 Merge pull request #66 from lbryio/add-tests-blob-handler 
add tests for BlobRequestHandler and run on travis
 2016-07-14 09:33:06 -05:00
kimihiro64
ee71a03f96 Revert to 2 params as isinstance cannot support 3+ (#69) 
* Revert to 2 params as isinstance cannot support 3+

* Use basestring for maximum efficiency
 2016-07-13 22:44:02 -05:00
Jack
5221631b40 Bump version: 0.3.5 -> 0.3.6 2016-07-12 17:30:58 -04:00
Jack
404412a950 return publish error message 2016-07-11 21:57:34 -04:00
Job Evers-Meltzer
53bf1fe4fd add send_blob tests 2016-07-10 21:56:00 -05:00
Jack
5c05daa007 update import to new file name 2016-07-10 22:21:50 -04:00
Jack
1b53e8e98c re-enable lbryum 2016-07-09 13:31:07 -04:00
Jack
b727bd20c8 version bump 2016-07-06 22:48:38 -04:00
Jack
5a703c116f linux lbrycrdd path 2016-07-06 22:46:59 -04:00
Alex Liebowitz
c58fc0781c Call xdg-open properly in jsonrpc_reveal() 2016-07-06 15:57:00 -04:00
Jack
03c02ff74f lbrycrdd path wierdness 2016-07-06 03:37:31 -04:00
Jack
9277c3c674 add help for when things go wrong 2016-07-06 03:02:55 -04:00
Jack
34b1259dc6 move check for if daemon is running to inside of function 2016-07-06 02:20:18 -04:00
Jack
257e38de12 add command line wrapper for lbrynet-daemon calls 2016-07-06 02:17:38 -04:00
Jack
1984132eae add update_available keys to version() 
as to not require making the version string comparison in whatever is
making the daemon call
 2016-07-06 01:46:49 -04:00
Jack
8b1d75ea98 check every 30 minutes for a new ui version 
-previously the check for a new ui version was only at startup, which
resulted in bugs persisting after they’d been fixed

-add option to skip requirements check

-try to load an existing ui if it can’t be obtained from github
 2016-07-06 01:27:25 -04:00
Alex Grintsvayg
8336930091 Bump version: 0.3.2 → 0.3.3 2016-07-05 15:20:35 -04:00
Alex Grintsvayg
d875325cee better non-root fix, restore version var 2016-07-05 15:20:30 -04:00
Alex Grintsvayg
f1c5d1cb23 Bump version: 0.3.1 → 0.3.2 2016-07-05 14:30:35 -04:00
Alex Grintsvayg
b55752e715 add bumpversion script 2016-07-05 14:29:24 -04:00
Jack
4c2ab23c1f write to the file that's supposed to be written to 2016-07-04 20:19:04 -04:00
Jack
0a3f81e364 fix download directory not existing problem 2016-07-04 20:02:38 -04:00
Jack
cca4331ac4 create lbrycrddpath.conf if it doesnt exist 2016-07-04 19:34:51 -04:00
Job Evers-Meltzer
794f2d8576 version bump: 0.3.0.2 2016-07-04 16:51:29 -05:00
Alex Liebowitz
e35dce530a Set default download dir to ~/Downloads on Linux 2016-07-04 17:49:48 -04:00
Job Evers-Meltzer
6034bd3cb2 version bump: 0.3.0.1 2016-07-04 15:47:12 -05:00
Job Evers‐Meltzer
42c77bbb67 Merge pull request #51 from lbryio/restart-lbrycrd 
add a more useful exception if auth fails on lbrycrd
 2016-07-04 15:45:44 -05:00
Job Evers‐Meltzer
d504c8f4a3 Merge pull request #50 from lbryio/lbrycrd-in-bundle 
Add lbrycrd to app bundle on macos
 2016-07-04 15:42:24 -05:00
Job Evers-Meltzer
976c8b3ce0 add a more useful exception if auth fails on lbrycrd 2016-07-04 15:40:52 -05:00
Job Evers-Meltzer
16f48d0400 Add lbrycrd to app bundle on macos 2016-07-04 15:18:08 -05:00
Alex Liebowitz
6d7608d851 Create lbrycrd.conf if needed 2016-07-04 16:16:34 -04:00
Jack
7b9e3aace9 use lbrycrd 2016-07-04 05:43:26 -04:00
Jack
568737e123 change lbryum version constant name 2016-07-04 05:15:53 -04:00
Jack
808e3ea6e3 rename LBRYcrdWallet.py to LBRYWallet.py and change default wallet to lbrycrd 2016-07-04 04:57:30 -04:00
Jack
1cedd8ee5b update name 2016-07-01 03:16:08 -04:00
Jack
b80fe24179 tanstaafl 2016-07-01 02:55:20 -04:00
Jack
3cea41a854 remove lbrynet_gui 2016-07-01 02:42:34 -04:00
Jack
62b80c13cc version bump 2016-06-30 01:26:33 -04:00
Jack
08b612575c update_claim fix and clean up publish keys 
-replace ‘value’ key with ‘metadata’

-update claim metadata in db when an update is published
 2016-06-28 23:20:28 -04:00
Jack
b3b804bf2d add update_name 2016-06-28 14:28:59 -04:00
Jack
09d8a86e30 rename variable 2016-06-28 02:06:04 -04:00
Jack
cc5d917c72 download fix 2016-06-28 01:51:05 -04:00
Jack
7cc3e9d5ef publish updates 
-adds a base set of metadata fields required for results to be rendered
in conf.py, including language and content-type

-dont support old style claims on the new blockchain
 2016-06-27 17:07:59 -04:00
Jack
f89486f5fe port and import name 2016-06-24 13:12:27 -04:00
Jack
761e4f2718 change variable name to lbrynet_log 2016-06-07 04:30:22 -04:00
Jack
3441dd4d2d don't mess with logging 2016-06-07 04:19:51 -04:00