From 9b3380862a9bf66b552e1e333b6e4a21e3f0dc48 Mon Sep 17 00:00:00 2001 From: steem-supporter <63218267+steem-supporter@users.noreply.github.com> Date: Thu, 16 Apr 2020 22:16:37 +0545 Subject: [PATCH 1/6] Update Dockerfile --- docker/development/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/development/Dockerfile b/docker/development/Dockerfile index 17d4a1e..db42313 100644 --- a/docker/development/Dockerfile +++ b/docker/development/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:16.04 ENV php_conf /etc/php/7.0/fpm/php.ini ENV fpm_conf /etc/php/7.0/fpm/php-fpm.conf -ENV composer_hash 544e09ee996cdf60ece3804abc52599c22b1f40f4323403c44d44fdfdd586475ca9813a858088ffbc1f233e9b180f061 +ENV composer_hash e0012edf3e80b6978849f5eff0d4b4e4c79ff1609dd1e613307e16318854d24ae64f26d17af3ef0bf7cfb710ca74755a RUN apt-get update && apt-get install -y software-properties-common python-software-properties From 89c9ec91564bef3ec8b609233ff46f787c7b5e66 Mon Sep 17 00:00:00 2001 From: steem-supporter <63218267+steem-supporter@users.noreply.github.com> Date: Fri, 17 Apr 2020 15:13:25 +0545 Subject: [PATCH 2/6] Update live.py --- docker/live/live.py | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/docker/live/live.py b/docker/live/live.py index e1f89de..c2e9bb0 100644 --- a/docker/live/live.py +++ b/docker/live/live.py @@ -163,15 +163,18 @@ def getRelatedAccounts(self, opType, opData): def register(self, client): if client not in self.clients: - # print("registered client [{}]".format(client.peer)) - self.subscribe(client, "blocks") - self.subscribe(client, "props") - self.subscribe(client, "state") - for x in range(1, 11): - previous = self.last_block_processed - 10 + x - self.publishBlock(previous) - self.clients.append(client) - + try: + # print("registered client [{}]".format(client.peer)) + self.subscribe(client, "blocks") + self.subscribe(client, "props") + self.subscribe(client, "state") + for x in range(1, 11): + previous = self.last_block_processed - 10 + x + self.publishBlock(previous) + self.clients.append(client) + except Exception as e: + print('error', e) + pass def unregister(self, client): if client in self.clients: # print("unregistered client [{}]".format(client.peer)) From fff97ec9295da283a45c0e6bd156ea0dbe793dcb Mon Sep 17 00:00:00 2001 From: steem-supporter <63218267+steem-supporter@users.noreply.github.com> Date: Fri, 17 Apr 2020 15:14:44 +0545 Subject: [PATCH 3/6] Update live.py --- docker/live/live.py | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/docker/live/live.py b/docker/live/live.py index c2e9bb0..51bbc3e 100644 --- a/docker/live/live.py +++ b/docker/live/live.py @@ -197,9 +197,16 @@ def subscribe(self, client, channel): def publish(self, channel, opType, opData): if channel in self.channels: for c in self.channels[channel]: - data = json.dumps({opType: opData}) - # print("publishing op '{}' [{}] to subscriber [{}] based on channel subscription [{}]".format(opType, data, c.peer, channel)) - c.sendMessage(data.encode('utf8')) + clients = self.channels[channel][:] + for c in clients: + try: + data = json.dumps({opType: opData}) + # print("publishing op '{}' [{}] to subscriber [{}] based on channel subscription [{}]".format(opType, data, c.peer, channel)) + c.sendMessage(data.encode('utf8')) + except Exception as e: + print('error:', e) + self.channels[channel].remove(c) + if __name__ == '__main__': From 6a74f88272a956e98fe76a588db6c6347ab02e23 Mon Sep 17 00:00:00 2001 From: steem-supporter <63218267+steem-supporter@users.noreply.github.com> Date: Fri, 17 Apr 2020 15:28:58 +0545 Subject: [PATCH 4/6] Update docker-compose.yml --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index d615678..a6c83d8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -28,7 +28,7 @@ services: # lucky: # build: ./docker/lucky # environment: - # steemnode: "steemd.steemit.com" + # steemnode: "api.steemit.com:443" development: build: ./docker/development # links: From a8607978610ed78525ab2d4ad590793f987e7b35 Mon Sep 17 00:00:00 2001 From: captain328 Date: Wed, 22 Apr 2020 12:15:02 +0300 Subject: [PATCH 5/6] fix: indentaion error in live.py --- docker/live/live.py | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/docker/live/live.py b/docker/live/live.py index 51bbc3e..7c86aae 100644 --- a/docker/live/live.py +++ b/docker/live/live.py @@ -163,18 +163,19 @@ def getRelatedAccounts(self, opType, opData): def register(self, client): if client not in self.clients: - try: - # print("registered client [{}]".format(client.peer)) - self.subscribe(client, "blocks") - self.subscribe(client, "props") - self.subscribe(client, "state") - for x in range(1, 11): - previous = self.last_block_processed - 10 + x - self.publishBlock(previous) - self.clients.append(client) - except Exception as e: - print('error', e) - pass + try: + # print("registered client [{}]".format(client.peer)) + self.subscribe(client, "blocks") + self.subscribe(client, "props") + self.subscribe(client, "state") + for x in range(1, 11): + previous = self.last_block_processed - 10 + x + self.publishBlock(previous) + self.clients.append(client) + except Exception as e: + print('error', e) + pass + def unregister(self, client): if client in self.clients: # print("unregistered client [{}]".format(client.peer)) From 5c31b894dceb3fe2860b2ff2100fe127f05d682a Mon Sep 17 00:00:00 2001 From: captain328 Date: Wed, 22 Apr 2020 12:21:32 +0300 Subject: [PATCH 6/6] chore: indentation error fix --- docker/live/live.py | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/docker/live/live.py b/docker/live/live.py index 7c86aae..a65fee7 100644 --- a/docker/live/live.py +++ b/docker/live/live.py @@ -163,18 +163,18 @@ def getRelatedAccounts(self, opType, opData): def register(self, client): if client not in self.clients: - try: - # print("registered client [{}]".format(client.peer)) - self.subscribe(client, "blocks") - self.subscribe(client, "props") - self.subscribe(client, "state") - for x in range(1, 11): - previous = self.last_block_processed - 10 + x - self.publishBlock(previous) - self.clients.append(client) - except Exception as e: - print('error', e) - pass + try: + # print("registered client [{}]".format(client.peer)) + self.subscribe(client, "blocks") + self.subscribe(client, "props") + self.subscribe(client, "state") + for x in range(1, 11): + previous = self.last_block_processed - 10 + x + self.publishBlock(previous) + self.clients.append(client) + except Exception as e: + print('error', e) + pass def unregister(self, client): if client in self.clients: