From 0b8437fa12768223e4d2952274b149935f9cee29 Mon Sep 17 00:00:00 2001 From: kimihiro64 Date: Wed, 17 Aug 2016 22:34:20 -0500 Subject: [PATCH 1/5] Proper no-cache for web-ui index.html --- lbrynet/lbrynet_daemon/LBRYDaemonServer.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lbrynet/lbrynet_daemon/LBRYDaemonServer.py b/lbrynet/lbrynet_daemon/LBRYDaemonServer.py index dc345bff5..c3e22ed3e 100644 --- a/lbrynet/lbrynet_daemon/LBRYDaemonServer.py +++ b/lbrynet/lbrynet_daemon/LBRYDaemonServer.py @@ -226,6 +226,8 @@ class LBRYindex(resource.Resource): return resource.Resource.getChild(self, name, request) def render_GET(self, request): + request.setHeader('cache-control','no-cache, no-store, must-revalidate') + request.setHeader('expires', '0') return static.File(os.path.join(self.ui_dir, "index.html")).render_GET(request) From c66df259a6efa03e64f76108bce6b634b88d3e56 Mon Sep 17 00:00:00 2001 From: kimihiro64 Date: Wed, 17 Aug 2016 23:02:00 -0500 Subject: [PATCH 2/5] fix editor spacing --- lbrynet/lbrynet_daemon/LBRYDaemonServer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lbrynet/lbrynet_daemon/LBRYDaemonServer.py b/lbrynet/lbrynet_daemon/LBRYDaemonServer.py index c3e22ed3e..ec868d492 100644 --- a/lbrynet/lbrynet_daemon/LBRYDaemonServer.py +++ b/lbrynet/lbrynet_daemon/LBRYDaemonServer.py @@ -227,7 +227,7 @@ class LBRYindex(resource.Resource): def render_GET(self, request): request.setHeader('cache-control','no-cache, no-store, must-revalidate') - request.setHeader('expires', '0') + request.setHeader('expires', '0') return static.File(os.path.join(self.ui_dir, "index.html")).render_GET(request) From e7158e5a4b5525ddffe642e7d079b431db230701 Mon Sep 17 00:00:00 2001 From: kimihiro64 Date: Wed, 17 Aug 2016 23:02:38 -0500 Subject: [PATCH 3/5] Fix editor spacing again --- lbrynet/lbrynet_daemon/LBRYDaemonServer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lbrynet/lbrynet_daemon/LBRYDaemonServer.py b/lbrynet/lbrynet_daemon/LBRYDaemonServer.py index ec868d492..0dd75d53f 100644 --- a/lbrynet/lbrynet_daemon/LBRYDaemonServer.py +++ b/lbrynet/lbrynet_daemon/LBRYDaemonServer.py @@ -227,7 +227,7 @@ class LBRYindex(resource.Resource): def render_GET(self, request): request.setHeader('cache-control','no-cache, no-store, must-revalidate') - request.setHeader('expires', '0') + request.setHeader('expires', '0') return static.File(os.path.join(self.ui_dir, "index.html")).render_GET(request) From 142281777e039a095e4b9530ffc48e9cabf1b5b4 Mon Sep 17 00:00:00 2001 From: Jack Date: Thu, 18 Aug 2016 06:37:57 -0400 Subject: [PATCH 4/5] stop heartbeat looping call on shutdown --- lbrynet/lbrynet_daemon/LBRYDaemon.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lbrynet/lbrynet_daemon/LBRYDaemon.py b/lbrynet/lbrynet_daemon/LBRYDaemon.py index 88313b2af..e6ef48e2b 100644 --- a/lbrynet/lbrynet_daemon/LBRYDaemon.py +++ b/lbrynet/lbrynet_daemon/LBRYDaemon.py @@ -357,6 +357,7 @@ class LBRYDaemon(jsonrpc.JSONRPC): self.version_checker = LoopingCall(self._check_remote_versions) self.connection_problem_checker = LoopingCall(self._check_connection_problems) self.pending_claim_checker = LoopingCall(self._check_pending_claims) + self.send_heartbeat = LoopingCall(self._send_heartbeat) # self.lbrynet_connection_checker = LoopingCall(self._check_lbrynet_connection) self.sd_identifier = StreamDescriptorIdentifier() @@ -530,7 +531,6 @@ class LBRYDaemon(jsonrpc.JSONRPC): def _load_analytics_api(self): self.analytics_api = analytics.Api.load() - self.send_heartbeat = LoopingCall(self._send_heartbeat) self.send_heartbeat.start(60) def _send_heartbeat(self): @@ -801,6 +801,8 @@ class LBRYDaemon(jsonrpc.JSONRPC): self.lbry_ui_manager.update_checker.stop() if self.pending_claim_checker.running: self.pending_claim_checker.stop() + if self.send_heartbeat.running: + self.send_heartbeat.stop() self._clean_up_temp_files() From f6473e3383956b7823a76516622bba6c172619e1 Mon Sep 17 00:00:00 2001 From: Jack Date: Thu, 18 Aug 2016 06:41:17 -0400 Subject: [PATCH 5/5] Bump version: 0.3.18 -> 0.3.19 --- .bumpversion.cfg | 2 +- lbrynet/__init__.py | 2 +- packaging/ubuntu/lbry.desktop | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 08490aa02..78907de6a 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.3.18 +current_version = 0.3.19 commit = True tag = True message = Bump version: {current_version} -> {new_version} diff --git a/lbrynet/__init__.py b/lbrynet/__init__.py index 0c3b4ac7a..d83b7602f 100644 --- a/lbrynet/__init__.py +++ b/lbrynet/__init__.py @@ -1,2 +1,2 @@ -__version__ = "0.3.18" +__version__ = "0.3.19" version = tuple(__version__.split('.')) \ No newline at end of file diff --git a/packaging/ubuntu/lbry.desktop b/packaging/ubuntu/lbry.desktop index 023031231..061299934 100644 --- a/packaging/ubuntu/lbry.desktop +++ b/packaging/ubuntu/lbry.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -Version=0.3.18 +Version=0.3.19 Name=LBRY Comment=The world's first user-owned content marketplace Icon=lbry