Skip to content

Commit bbeca28

Browse files
ChiragAgg5kChiragAgg5k
committed
refactor use env variables for queue and class names
1 parent 9ab9f6d commit bbeca28

14 files changed

Lines changed: 62 additions & 54 deletions

File tree

‎app/controllers/api/health.php‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -945,18 +945,18 @@
945945
contentType: ContentType::JSON
946946
))
947947
->param('name', '', new WhiteList([
948-
Event::DATABASE_QUEUE_NAME,
949-
Event::DELETE_QUEUE_NAME,
950-
Event::AUDITS_QUEUE_NAME,
951-
Event::MAILS_QUEUE_NAME,
952-
Event::FUNCTIONS_QUEUE_NAME,
953-
Event::STATS_RESOURCES_QUEUE_NAME,
954-
Event::STATS_USAGE_QUEUE_NAME,
955-
Event::WEBHOOK_QUEUE_NAME,
956-
Event::CERTIFICATES_QUEUE_NAME,
957-
Event::BUILDS_QUEUE_NAME,
958-
Event::MESSAGING_QUEUE_NAME,
959-
Event::MIGRATIONS_QUEUE_NAME
948+
System::getEnv('_APP_DATABASE_QUEUE_NAME', Event::DATABASE_QUEUE_NAME),
949+
System::getEnv('_APP_DELETE_QUEUE_NAME', Event::DELETE_QUEUE_NAME),
950+
System::getEnv('_APP_AUDITS_QUEUE_NAME', Event::AUDITS_QUEUE_NAME),
951+
System::getEnv('_APP_MAILS_QUEUE_NAME', Event::MAILS_QUEUE_NAME),
952+
System::getEnv('_APP_FUNCTIONS_QUEUE_NAME', Event::FUNCTIONS_QUEUE_NAME),
953+
System::getEnv('_APP_STATS_RESOURCES_QUEUE_NAME', Event::STATS_RESOURCES_QUEUE_NAME),
954+
System::getEnv('_APP_STATS_USAGE_QUEUE_NAME', Event::STATS_USAGE_QUEUE_NAME),
955+
System::getEnv('_APP_WEBHOOK_QUEUE_NAME', Event::WEBHOOK_QUEUE_NAME),
956+
System::getEnv('_APP_CERTIFICATES_QUEUE_NAME', Event::CERTIFICATES_QUEUE_NAME),
957+
System::getEnv('_APP_BUILDS_QUEUE_NAME', Event::BUILDS_QUEUE_NAME),
958+
System::getEnv('_APP_MESSAGING_QUEUE_NAME', Event::MESSAGING_QUEUE_NAME),
959+
System::getEnv('_APP_MIGRATIONS_QUEUE_NAME', Event::MIGRATIONS_QUEUE_NAME)
960960
]), 'The name of the queue')
961961
->param('threshold', 5000, new Integer(true), 'Queue size threshold. When hit (equal or higher), endpoint returns server error. Default value is 5000.', true)
962962
->inject('response')
@@ -993,18 +993,18 @@
993993

994994
/** @var Event $queue */
995995
$queue = match ($name) {
996-
Event::DATABASE_QUEUE_NAME => $queueForDatabase,
997-
Event::DELETE_QUEUE_NAME => $queueForDeletes,
998-
Event::AUDITS_QUEUE_NAME => $queueForAudits,
999-
Event::MAILS_QUEUE_NAME => $queueForMails,
1000-
Event::FUNCTIONS_QUEUE_NAME => $queueForFunctions,
1001-
Event::STATS_RESOURCES_QUEUE_NAME => $queueForStatsResources,
1002-
Event::STATS_USAGE_QUEUE_NAME => $queueForStatsUsage,
1003-
Event::WEBHOOK_QUEUE_NAME => $queueForWebhooks,
1004-
Event::CERTIFICATES_QUEUE_NAME => $queueForCertificates,
1005-
Event::BUILDS_QUEUE_NAME => $queueForBuilds,
1006-
Event::MESSAGING_QUEUE_NAME => $queueForMessaging,
1007-
Event::MIGRATIONS_QUEUE_NAME => $queueForMigrations,
996+
System::getEnv('_APP_DATABASE_QUEUE_NAME', Event::DATABASE_QUEUE_NAME) => $queueForDatabase,
997+
System::getEnv('_APP_DELETE_QUEUE_NAME', Event::DELETE_QUEUE_NAME) => $queueForDeletes,
998+
System::getEnv('_APP_AUDITS_QUEUE_NAME', Event::AUDITS_QUEUE_NAME) => $queueForAudits,
999+
System::getEnv('_APP_MAILS_QUEUE_NAME', Event::MAILS_QUEUE_NAME) => $queueForMails,
1000+
System::getEnv('_APP_FUNCTIONS_QUEUE_NAME', Event::FUNCTIONS_QUEUE_NAME) => $queueForFunctions,
1001+
System::getEnv('_APP_STATS_RESOURCES_QUEUE_NAME', Event::STATS_RESOURCES_QUEUE_NAME) => $queueForStatsResources,
1002+
System::getEnv('_APP_STATS_USAGE_QUEUE_NAME', Event::STATS_USAGE_QUEUE_NAME) => $queueForStatsUsage,
1003+
System::getEnv('_APP_WEBHOOK_QUEUE_NAME', Event::WEBHOOK_QUEUE_NAME) => $queueForWebhooks,
1004+
System::getEnv('_APP_CERTIFICATES_QUEUE_NAME', Event::CERTIFICATES_QUEUE_NAME) => $queueForCertificates,
1005+
System::getEnv('_APP_BUILDS_QUEUE_NAME', Event::BUILDS_QUEUE_NAME) => $queueForBuilds,
1006+
System::getEnv('_APP_MESSAGING_QUEUE_NAME', Event::MESSAGING_QUEUE_NAME) => $queueForMessaging,
1007+
System::getEnv('_APP_MIGRATIONS_QUEUE_NAME', Event::MIGRATIONS_QUEUE_NAME) => $queueForMigrations,
10081008
};
10091009
$failed = $queue->getSize(failed: true);
10101010

‎src/Appwrite/Event/Audit.php‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
namespace Appwrite\Event;
44

55
use Utopia\Queue\Publisher;
6+
use Utopia\System\System;
67

78
class Audit extends Event
89
{
@@ -19,8 +20,8 @@ public function __construct(protected Publisher $publisher)
1920
parent::__construct($publisher);
2021

2122
$this
22-
->setQueue(Event::AUDITS_QUEUE_NAME)
23-
->setClass(Event::AUDITS_CLASS_NAME);
23+
->setQueue(System::getEnv('_APP_AUDITS_QUEUE_NAME', Event::AUDITS_QUEUE_NAME))
24+
->setClass(System::getEnv('_APP_AUDITS_CLASS_NAME', Event::AUDITS_CLASS_NAME));
2425
}
2526

2627
/**

‎src/Appwrite/Event/Build.php‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
use Utopia\Config\Config;
66
use Utopia\Database\Document;
77
use Utopia\Queue\Publisher;
8+
use Utopia\System\System;
89

910
class Build extends Event
1011
{
@@ -18,8 +19,8 @@ public function __construct(protected Publisher $publisher)
1819
parent::__construct($publisher);
1920

2021
$this
21-
->setQueue(Event::BUILDS_QUEUE_NAME)
22-
->setClass(Event::BUILDS_CLASS_NAME);
22+
->setQueue(System::getEnv('_APP_BUILDS_QUEUE_NAME', Event::BUILDS_QUEUE_NAME))
23+
->setClass(System::getEnv('_APP_BUILDS_CLASS_NAME', Event::BUILDS_CLASS_NAME));
2324
}
2425

2526
/**

‎src/Appwrite/Event/Certificate.php‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
use Utopia\Database\Document;
66
use Utopia\Queue\Publisher;
7+
use Utopia\System\System;
78

89
class Certificate extends Event
910
{
@@ -16,8 +17,8 @@ public function __construct(protected Publisher $publisher)
1617
parent::__construct($publisher);
1718

1819
$this
19-
->setQueue(Event::CERTIFICATES_QUEUE_NAME)
20-
->setClass(Event::CERTIFICATES_CLASS_NAME);
20+
->setQueue(System::getEnv('_APP_CERTIFICATES_QUEUE_NAME', Event::CERTIFICATES_QUEUE_NAME))
21+
->setClass(System::getEnv('_APP_CERTIFICATES_CLASS_NAME', Event::CERTIFICATES_CLASS_NAME));
2122
}
2223

2324
/**

‎src/Appwrite/Event/Database.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
use Utopia\Database\Document;
66
use Utopia\DSN\DSN;
77
use Utopia\Queue\Publisher;
8+
use Utopia\System\System;
89

910
class Database extends Event
1011
{
@@ -24,7 +25,7 @@ public function __construct(protected Publisher $publisher)
2425
{
2526
parent::__construct($publisher);
2627

27-
$this->setClass(Event::DATABASE_CLASS_NAME);
28+
$this->setClass(System::getEnv('_APP_DATABASE_CLASS_NAME', Event::DATABASE_CLASS_NAME));
2829
}
2930

3031
/**

‎src/Appwrite/Event/Delete.php‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
use Utopia\Database\Document;
66
use Utopia\Queue\Publisher;
7+
use Utopia\System\System;
78

89
class Delete extends Event
910
{
@@ -20,8 +21,8 @@ public function __construct(protected Publisher $publisher)
2021
parent::__construct($publisher);
2122

2223
$this
23-
->setQueue(Event::DELETE_QUEUE_NAME)
24-
->setClass(Event::DELETE_CLASS_NAME);
24+
->setQueue(System::getEnv('_APP_DELETE_QUEUE_NAME', Event::DELETE_QUEUE_NAME))
25+
->setClass(System::getEnv('_APP_DELETE_CLASS_NAME', Event::DELETE_CLASS_NAME));
2526
}
2627

2728
/**

‎src/Appwrite/Event/Func.php‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
use Utopia\Config\Config;
66
use Utopia\Database\Document;
77
use Utopia\Queue\Publisher;
8+
use Utopia\System\System;
89

910
class Func extends Event
1011
{
@@ -25,8 +26,8 @@ public function __construct(protected Publisher $publisher)
2526
parent::__construct($publisher);
2627

2728
$this
28-
->setQueue(Event::FUNCTIONS_QUEUE_NAME)
29-
->setClass(Event::FUNCTIONS_CLASS_NAME);
29+
->setQueue(System::getEnv('_APP_FUNCTIONS_QUEUE_NAME', Event::FUNCTIONS_QUEUE_NAME))
30+
->setClass(System::getEnv('_APP_FUNCTIONS_CLASS_NAME', Event::FUNCTIONS_CLASS_NAME));
3031
}
3132

3233
/**

‎src/Appwrite/Event/Mail.php‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
use Utopia\Config\Config;
66
use Utopia\Queue\Publisher;
7+
use Utopia\System\System;
78

89
class Mail extends Event
910
{
@@ -24,8 +25,8 @@ public function __construct(protected Publisher $publisher)
2425
parent::__construct($publisher);
2526

2627
$this
27-
->setQueue(Event::MAILS_QUEUE_NAME)
28-
->setClass(Event::MAILS_CLASS_NAME);
28+
->setQueue(System::getEnv('_APP_MAILS_QUEUE_NAME', Event::MAILS_QUEUE_NAME))
29+
->setClass(System::getEnv('_APP_MAILS_CLASS_NAME', Event::MAILS_CLASS_NAME));
2930
}
3031

3132
/**

‎src/Appwrite/Event/Messaging.php‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
use Utopia\Database\Document;
66
use Utopia\Queue\Publisher;
7+
use Utopia\System\System;
78

89
class Messaging extends Event
910
{
@@ -19,8 +20,8 @@ public function __construct(protected Publisher $publisher)
1920
parent::__construct($publisher);
2021

2122
$this
22-
->setQueue(Event::MESSAGING_QUEUE_NAME)
23-
->setClass(Event::MESSAGING_CLASS_NAME);
23+
->setQueue(System::getEnv('_APP_MESSAGING_QUEUE_NAME', Event::MESSAGING_QUEUE_NAME))
24+
->setClass(System::getEnv('_APP_MESSAGING_CLASS_NAME', Event::MESSAGING_CLASS_NAME));
2425
}
2526

2627
/**

‎src/Appwrite/Event/Migration.php‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
use Utopia\Config\Config;
66
use Utopia\Database\Document;
77
use Utopia\Queue\Publisher;
8+
use Utopia\System\System;
89

910
class Migration extends Event
1011
{
@@ -16,8 +17,8 @@ public function __construct(protected Publisher $publisher)
1617
parent::__construct($publisher);
1718

1819
$this
19-
->setQueue(Event::MIGRATIONS_QUEUE_NAME)
20-
->setClass(Event::MIGRATIONS_CLASS_NAME);
20+
->setQueue(System::getEnv('_APP_MIGRATIONS_QUEUE_NAME', Event::MIGRATIONS_QUEUE_NAME))
21+
->setClass(System::getEnv('_APP_MIGRATIONS_CLASS_NAME', Event::MIGRATIONS_CLASS_NAME));
2122
}
2223

2324
/**

0 commit comments

Comments
 (0)