From 917c9c8f4479d15ebd2b2b0b19c0329608dd9d24 Mon Sep 17 00:00:00 2001 From: the-superpirate Date: Sat, 24 Apr 2021 16:28:04 +0300 Subject: [PATCH] - fix(nexus): Fixed typos - feat(nexus): Fixes for build - part 3 1 internal commit(s) GitOrigin-RevId: f72221895758a1f796f359f9bd55d39bd76e1028 --- nexus/bot/configs/base.yaml | 4 +++- nexus/hub/configs/base.yaml | 3 ++- nexus/hub/main.py | 23 +++++++++++++---------- 3 files changed, 18 insertions(+), 12 deletions(-) diff --git a/nexus/bot/configs/base.yaml b/nexus/bot/configs/base.yaml index e1f7b00..8a34daa 100644 --- a/nexus/bot/configs/base.yaml +++ b/nexus/bot/configs/base.yaml @@ -48,6 +48,8 @@ idm: log_path: '/var/log/nexus-bot' meta_api: url: +metrics: + enabled: false telegram: # Telegram App Hash from https://my.telegram.org/ app_hash: '{{ APP_HASH }}' @@ -65,7 +67,7 @@ telegram: copyright_infringement_account: # Telethon database for keeping cache database: - session_id: '/usr/lib/nexus-bot/session.db' + session_id: /tmp/nexus-bot.db # Enabled handlers handlers: - nexus.bot.handlers.admin.AdminHandler diff --git a/nexus/hub/configs/base.yaml b/nexus/hub/configs/base.yaml index 88a89c2..09ea66e 100644 --- a/nexus/hub/configs/base.yaml +++ b/nexus/hub/configs/base.yaml @@ -16,6 +16,7 @@ database: password: username: grobid: + enabled: false url: grpc: # Listen address @@ -45,7 +46,7 @@ telegram: bot_token: # Telethon database for keeping cache database: - session_id: nexus-hub + session_id: /tmp/nexus-hub.db # Frequency of updating downloading progress progress_throttle_seconds: 5 # Send files using stored telegram_file_id diff --git a/nexus/hub/main.py b/nexus/hub/main.py index 309e35d..3ee24bf 100644 --- a/nexus/hub/main.py +++ b/nexus/hub/main.py @@ -31,6 +31,7 @@ class GrpcServer(AioGrpcServer): database=config['telegram'].get('database'), mtproxy=config['telegram'].get('mtproxy'), ) + self.starts.append(self.telegram_client) self.delivery_service = DeliveryService( server=self.server, service_name=config['application']['service_name'], @@ -44,17 +45,19 @@ class GrpcServer(AioGrpcServer): should_use_telegram_file_id=config['telegram']['should_use_telegram_file_id'], telegram_client=self.telegram_client, ) - self.submitter_service = SubmitterService( - server=self.server, - service_name=config['application']['service_name'], - bot_external_name=config['telegram']['bot_external_name'], - grobid_config=config['grobid'], - ipfs_config=config['ipfs'], - meta_api_config=config['meta_api'], - telegram_client=self.telegram_client, - ) + self.starts.append(self.delivery_service) + if config['grobid']['enabled']: + self.submitter_service = SubmitterService( + server=self.server, + service_name=config['application']['service_name'], + bot_external_name=config['telegram']['bot_external_name'], + grobid_config=config['grobid'], + ipfs_config=config['ipfs'], + meta_api_config=config['meta_api'], + telegram_client=self.telegram_client, + ) + self.starts.append(self.submitter_service) self.waits.append(self.pool_holder) - self.starts.extend([self.telegram_client, self.delivery_service, self.submitter_service]) def main():