diff --git a/app/init.php b/app/init.php index a891e6f612..f272c3905f 100644 --- a/app/init.php +++ b/app/init.php @@ -29,7 +29,6 @@ use Appwrite\Database\Pool\RedisPool; use Appwrite\Database\Validator\Authorization; use Appwrite\Event\Event; use Appwrite\Event\Realtime; -use Appwrite\Extend\PDO; use Appwrite\OpenSSL\OpenSSL; use Utopia\App; use Utopia\View; @@ -171,34 +170,6 @@ $register->set('redisPool', function () { return $pool; }); -$register->set('db', function () { - $dbHost = App::getEnv('_APP_DB_HOST', ''); - $dbUser = App::getEnv('_APP_DB_USER', ''); - $dbPass = App::getEnv('_APP_DB_PASS', ''); - $dbScheme = App::getEnv('_APP_DB_SCHEMA', ''); - - $pdo = new PDO("mysql:host={$dbHost};dbname={$dbScheme};charset=utf8mb4", $dbUser, $dbPass, array( - PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8mb4', - PDO::ATTR_TIMEOUT => 3, // Seconds - PDO::ATTR_PERSISTENT => true, - PDO::ATTR_DEFAULT_FETCH_MODE => PDO::FETCH_ASSOC, - PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION, - )); - - return $pdo; -}); -$register->set('influxdb', function () { // Register DB connection - $host = App::getEnv('_APP_INFLUXDB_HOST', ''); - $port = App::getEnv('_APP_INFLUXDB_PORT', ''); - - if (empty($host) || empty($port)) { - return; - } - - $client = new InfluxDB\Client($host, $port, '', '', false, false, 5); - - return $client; -}); $register->set('statsd', function () { // Register DB connection $host = App::getEnv('_APP_STATSD_HOST', 'telegraf'); $port = App::getEnv('_APP_STATSD_PORT', 8125); diff --git a/app/workers.php b/app/workers.php new file mode 100644 index 0000000000..a0df772da5 --- /dev/null +++ b/app/workers.php @@ -0,0 +1,37 @@ +set('db', function () { + $dbHost = App::getEnv('_APP_DB_HOST', ''); + $dbUser = App::getEnv('_APP_DB_USER', ''); + $dbPass = App::getEnv('_APP_DB_PASS', ''); + $dbScheme = App::getEnv('_APP_DB_SCHEMA', ''); + + $pdo = new PDO("mysql:host={$dbHost};dbname={$dbScheme};charset=utf8mb4", $dbUser, $dbPass, array( + PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8mb4', + PDO::ATTR_TIMEOUT => 3, // Seconds + PDO::ATTR_PERSISTENT => true, + PDO::ATTR_DEFAULT_FETCH_MODE => PDO::FETCH_ASSOC, + PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION, + )); + + return $pdo; +}); +$register->set('influxdb', function () { // Register DB connection + $host = App::getEnv('_APP_INFLUXDB_HOST', ''); + $port = App::getEnv('_APP_INFLUXDB_PORT', ''); + + if (empty($host) || empty($port)) { + return; + } + + $client = new InfluxDB\Client($host, $port, '', '', false, false, 5); + + return $client; +}); \ No newline at end of file diff --git a/app/workers/audits.php b/app/workers/audits.php index 13af7e828e..9ec03d9c81 100644 --- a/app/workers/audits.php +++ b/app/workers/audits.php @@ -5,7 +5,7 @@ use Utopia\Audit\Audit; use Utopia\Audit\Adapters\MySQL as AuditAdapter; use Utopia\CLI\Console; -require_once __DIR__.'/../init.php'; +require_once __DIR__.'/../workers.php'; Console::title('Audits V1 Worker'); diff --git a/app/workers/certificates.php b/app/workers/certificates.php index 93349ab607..8f48da6987 100644 --- a/app/workers/certificates.php +++ b/app/workers/certificates.php @@ -11,7 +11,7 @@ use Appwrite\Database\Validator\Authorization; use Appwrite\Network\Validator\CNAME; use Appwrite\Resque\Worker; -require_once __DIR__.'/../init.php'; +require_once __DIR__.'/../workers.php'; Console::title('Certificates V1 Worker'); diff --git a/app/workers/deletes.php b/app/workers/deletes.php index 0478f7661a..523d56a4f9 100644 --- a/app/workers/deletes.php +++ b/app/workers/deletes.php @@ -14,7 +14,7 @@ use Utopia\Config\Config; use Utopia\Audit\Audit; use Utopia\Audit\Adapters\MySQL as AuditAdapter; -require_once __DIR__.'/../init.php'; +require_once __DIR__.'/../workers.php'; Console::title('Deletes V1 Worker'); diff --git a/app/workers/functions.php b/app/workers/functions.php index 2cedffd240..48d3a9a6fe 100644 --- a/app/workers/functions.php +++ b/app/workers/functions.php @@ -13,7 +13,7 @@ use Utopia\App; use Utopia\CLI\Console; use Utopia\Config\Config; -require_once __DIR__.'/../init.php'; +require_once __DIR__.'/../workers.php'; Console::title('Functions V1 Worker'); diff --git a/app/workers/mails.php b/app/workers/mails.php index 50e499f901..e0f34d1d9a 100644 --- a/app/workers/mails.php +++ b/app/workers/mails.php @@ -4,7 +4,7 @@ use Appwrite\Resque\Worker; use Utopia\App; use Utopia\CLI\Console; -require_once __DIR__.'/../init.php'; +require_once __DIR__.'/../workers.php'; Console::title('Mails V1 Worker'); diff --git a/app/workers/tasks.php b/app/workers/tasks.php index 70d705431e..7fedb2c827 100644 --- a/app/workers/tasks.php +++ b/app/workers/tasks.php @@ -10,7 +10,7 @@ use Appwrite\Database\Validator\Authorization; use Appwrite\Resque\Worker; use Cron\CronExpression; -require_once __DIR__.'/../init.php'; +require_once __DIR__.'/../workers.php'; Console::title('Tasks V1 Worker'); diff --git a/app/workers/usage.php b/app/workers/usage.php index 1d1a5ba5a7..3b261500b4 100644 --- a/app/workers/usage.php +++ b/app/workers/usage.php @@ -4,7 +4,7 @@ use Appwrite\Resque\Worker; use Utopia\App; use Utopia\CLI\Console; -require_once __DIR__.'/../init.php'; +require_once __DIR__.'/../workers.php'; Console::title('Usage V1 Worker'); diff --git a/app/workers/webhooks.php b/app/workers/webhooks.php index eba7f7cf8f..0ef1038243 100644 --- a/app/workers/webhooks.php +++ b/app/workers/webhooks.php @@ -9,7 +9,7 @@ use Appwrite\Database\Adapter\Redis as RedisAdapter; use Appwrite\Database\Validator\Authorization; use Appwrite\Resque\Worker; -require_once __DIR__.'/../init.php'; +require_once __DIR__.'/../workers.php'; Console::title('Webhooks V1 Worker');