diff --git a/.env b/.env index 4d7c038a6b..960405111a 100644 --- a/.env +++ b/.env @@ -103,6 +103,7 @@ _APP_MAINTENANCE_RETENTION_USAGE_HOURLY=8640000 _APP_MAINTENANCE_RETENTION_SCHEDULES=86400 _APP_USAGE_STATS=enabled _APP_LOGGING_CONFIG= +_APP_LOGGING_CONFIG_REALTIME= _APP_GRAPHQL_MAX_BATCH_SIZE=10 _APP_GRAPHQL_MAX_COMPLEXITY=250 _APP_GRAPHQL_MAX_DEPTH=4 diff --git a/app/init/registers.php b/app/init/registers.php index 3dc0e22dba..aecc34740a 100644 --- a/app/init/registers.php +++ b/app/init/registers.php @@ -39,6 +39,7 @@ if (!App::isProduction()) { PublicDomain::allow(['request-catcher-sms']); PublicDomain::allow(['request-catcher-webhook']); } + $register->set('logger', function () { // Register error logger $providerName = System::getEnv('_APP_LOGGING_PROVIDER', ''); @@ -97,6 +98,51 @@ $register->set('logger', function () { return new Logger($adapter); }); +$register->set('realtimeLogger', function () { + // Register error logger for realtime, falls back to default logging config + $providerConfig = System::getEnv('_APP_LOGGING_CONFIG_REALTIME', '') + ?: System::getEnv('_APP_LOGGING_CONFIG', ''); + + if (empty($providerConfig)) { + return; + } + + $loggingProvider = new DSN($providerConfig); + $providerName = $loggingProvider->getScheme(); + $providerConfig = match ($providerName) { + 'sentry' => ['key' => $loggingProvider->getPassword(), 'projectId' => $loggingProvider->getUser() ?? '', 'host' => 'https://' . $loggingProvider->getHost()], + 'logowl' => ['ticket' => $loggingProvider->getUser() ?? '', 'host' => $loggingProvider->getHost()], + default => ['key' => $loggingProvider->getHost()], + }; + + if (empty($providerName) || empty($providerConfig)) { + return; + } + + if (!Logger::hasProvider($providerName)) { + throw new Exception(Exception::GENERAL_SERVER_ERROR, "Logging provider not supported. Logging is disabled"); + } + + try { + $adapter = match ($providerName) { + 'sentry' => new Sentry($providerConfig['projectId'], $providerConfig['key'], $providerConfig['host']), + 'logowl' => new LogOwl($providerConfig['ticket'], $providerConfig['host']), + 'raygun' => new Raygun($providerConfig['key']), + 'appsignal' => new AppSignal($providerConfig['key']), + default => null + }; + } catch (Throwable $th) { + $adapter = null; + } + + if ($adapter === null) { + Console::error("Logging provider not supported. Logging is disabled"); + return; + } + + return new Logger($adapter); +}); + $register->set('pools', function () { $group = new Group(); diff --git a/app/realtime.php b/app/realtime.php index e18ab8e10d..936e3fde0d 100644 --- a/app/realtime.php +++ b/app/realtime.php @@ -236,7 +236,7 @@ $adapter $server = new Server($adapter); $logError = function (Throwable $error, string $action) use ($register) { - $logger = $register->get('logger'); + $logger = $register->get('realtimeLogger'); if ($logger && !$error instanceof Exception) { $version = System::getEnv('_APP_VERSION', 'UNKNOWN'); diff --git a/docker-compose.yml b/docker-compose.yml index 32e81ea5e3..1bd56149ab 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -285,6 +285,7 @@ services: - _APP_DB_PASS - _APP_USAGE_STATS - _APP_LOGGING_CONFIG + - _APP_LOGGING_CONFIG_REALTIME - _APP_DATABASE_SHARED_TABLES appwrite-worker-audits: