From d681df8aff6d807cc8e6e9fadc38b75eae9dd3f3 Mon Sep 17 00:00:00 2001 From: Daniil Gentili Date: Fri, 13 Sep 2019 17:34:39 +0200 Subject: [PATCH] Better logging --- src/danog/MadelineProto/Connection.php | 14 +++++++------- src/danog/MadelineProto/DataCenterConnection.php | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/danog/MadelineProto/Connection.php b/src/danog/MadelineProto/Connection.php index 7ae281b1..1d8cdec6 100644 --- a/src/danog/MadelineProto/Connection.php +++ b/src/danog/MadelineProto/Connection.php @@ -303,14 +303,14 @@ class Connection extends Session */ public function connect(ConnectionContext $ctx): \Generator { - //$this->API->logger->logger("Trying connection ({$this->id}) via $ctx", \danog\MadelineProto\Logger::WARNING); - - $ctx->setReadCallback([$this, 'haveRead']); - $this->ctx = $ctx->getCtx(); $this->datacenter = $ctx->getDc(); $this->datacenterId = $this->datacenter.'.'.$this->id; + $this->API->logger->logger("Connecting to DC {$this->datacenterId}", \danog\MadelineProto\Logger::WARNING); + + $ctx->setReadCallback([$this, 'haveRead']); $this->stream = yield $ctx->getStream(); + if (isset($this->old)) { unset($this->old); } @@ -470,7 +470,7 @@ class Connection extends Session */ public function disconnect() { - //$this->API->logger->logger("Disconnecting from DC {$this->datacenterId}"); + $this->API->logger->logger("Disconnecting from DC {$this->datacenterId}"); $this->old = true; foreach (['reader', 'writer', 'checker', 'waiter', 'updater'] as $loop) { if (isset($this->{$loop}) && $this->{$loop}) { @@ -484,7 +484,7 @@ class Connection extends Session $this->API->logger->logger($e); } } - //$this->API->logger->logger("Disconnected from DC {$this->datacenterId}"); + $this->API->logger->logger("Disconnected from DC {$this->datacenterId}"); } /** @@ -494,7 +494,7 @@ class Connection extends Session */ public function reconnect(): \Generator { - //$this->API->logger->logger("Reconnecting DC {$this->datacenterId}"); + $this->API->logger->logger("Reconnecting DC {$this->datacenterId}"); $this->disconnect(); yield $this->API->datacenter->dcConnectAsync($this->ctx->getDc(), $this->id); if ($this->API->hasAllAuth() && !$this->hasPendingCalls()) { diff --git a/src/danog/MadelineProto/DataCenterConnection.php b/src/danog/MadelineProto/DataCenterConnection.php index 66d8b486..1969a670 100644 --- a/src/danog/MadelineProto/DataCenterConnection.php +++ b/src/danog/MadelineProto/DataCenterConnection.php @@ -326,7 +326,7 @@ class DataCenterConnection implements JsonSerializable */ public function connect(ConnectionContext $ctx, int $id = -1): \Generator { - $this->API->logger->logger("Trying shared connection via $ctx"); + $this->API->logger->logger("Trying shared connection via $ctx ($id)"); $this->ctx = $ctx->getCtx(); $this->datacenter = $ctx->getDc();