From b0f5dd7acd4eb8ceb48732766f78119193785563 Mon Sep 17 00:00:00 2001 From: trungpv Date: Mon, 18 Mar 2019 15:59:38 +0700 Subject: [PATCH 1/6] remove require php 7.2 --- .gitignore | 1 + composer.json | 5 +---- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 4c36e38..072705c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ .idea/ vendor/ +composer.lock diff --git a/composer.json b/composer.json index 3d8403b..2a12369 100644 --- a/composer.json +++ b/composer.json @@ -14,8 +14,5 @@ "Dynatech\\Libraries\\BeeQueue\\": "src/" } }, - "minimum-stability": "stable", - "require": { - "php": "^7.2.0" - } + "minimum-stability": "stable" } From e97b52270dd9a0a05e3467926b0f2dcd32a4b105 Mon Sep 17 00:00:00 2001 From: trungpv Date: Mon, 18 Mar 2019 16:01:42 +0700 Subject: [PATCH 2/6] change name in composer.json with my own package --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 2a12369..6479d64 100644 --- a/composer.json +++ b/composer.json @@ -1,5 +1,5 @@ { - "name": "waylandace/bee-queue", + "name": "trungpv1601/bee-queue", "description": "PHP handler for bee-queue redis queue", "type": "library", "license": "MIT", From 7e2f4ca76c1f8ba0b6e45ff3de2947ff3557606b Mon Sep 17 00:00:00 2001 From: trungpv Date: Mon, 18 Mar 2019 16:07:43 +0700 Subject: [PATCH 3/6] remove minimum-stability --- composer.json | 3 +-- composer.lock | 19 ------------------- 2 files changed, 1 insertion(+), 21 deletions(-) delete mode 100644 composer.lock diff --git a/composer.json b/composer.json index 6479d64..2f2001b 100644 --- a/composer.json +++ b/composer.json @@ -13,6 +13,5 @@ "psr-4": { "Dynatech\\Libraries\\BeeQueue\\": "src/" } - }, - "minimum-stability": "stable" + } } diff --git a/composer.lock b/composer.lock deleted file mode 100644 index 985d350..0000000 --- a/composer.lock +++ /dev/null @@ -1,19 +0,0 @@ -{ - "_readme": [ - "This file locks the dependencies of your project to a known state", - "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", - "This file is @generated automatically" - ], - "content-hash": "b13b5e322fe402cd0ee744637dfa4d48", - "packages": [], - "packages-dev": [], - "aliases": [], - "minimum-stability": "stable", - "stability-flags": [], - "prefer-stable": false, - "prefer-lowest": false, - "platform": { - "php": ">7.2.0" - }, - "platform-dev": [] -} From 51b5cc14e4bd96bfe6a677a07c75534daf82f437 Mon Sep 17 00:00:00 2001 From: trungpv Date: Mon, 18 Mar 2019 17:21:42 +0700 Subject: [PATCH 4/6] Add auth password for redis --- src/Queue.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Queue.php b/src/Queue.php index 4ce4bdb..7f2cd6f 100644 --- a/src/Queue.php +++ b/src/Queue.php @@ -31,9 +31,13 @@ public function __construct( } else { $redis['host'] = $redis['host'] ?? '127.0.0.1'; $redis['port'] = $redis['port'] ?? 6379; + $redis['password'] = $redis['password'] ?? false; $this->redis = new \Redis(); $this->redis->connect($redis['host'], $redis['port']); + if ($redis['password']) { + $this->redis->auth($redis['password']); + } } $this->settings = [ From 078062f0423d7e9582d4a8a0530d7ef03ef68786 Mon Sep 17 00:00:00 2001 From: trungpv Date: Mon, 18 Mar 2019 21:45:19 +0700 Subject: [PATCH 5/6] Add destroy queue --- src/Queue.php | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/Queue.php b/src/Queue.php index 7f2cd6f..4032c2e 100644 --- a/src/Queue.php +++ b/src/Queue.php @@ -100,4 +100,14 @@ public function isStoreJobs(): bool { return $this->settings['storeJobs'] === true; } + + /** + * [destroy description] + * @return [type] [description] + */ + public function destroy() + { + $queueKeys = $this->redis->keys($this->settings['keyPrefix'] . '*'); + $this->redis->delete($queueKeys); + } } From d1c26936a8d87987e6754610b8d21596e88db4ec Mon Sep 17 00:00:00 2001 From: trungpv Date: Sat, 13 Apr 2019 12:55:29 +0700 Subject: [PATCH 6/6] add checkHealth function --- src/Queue.php | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/src/Queue.php b/src/Queue.php index 4032c2e..141cbf9 100644 --- a/src/Queue.php +++ b/src/Queue.php @@ -110,4 +110,21 @@ public function destroy() $queueKeys = $this->redis->keys($this->settings['keyPrefix'] . '*'); $this->redis->delete($queueKeys); } + + /** + * [checkHealth description] + * @return [type] [description] + */ + public function checkHealth(): array + { + $results = [ + 'waiting' => $this->redis->lLen($this->toKey('waiting')) ?? 0, + 'active' => $this->redis->lLen($this->toKey('active')) ?? 0, + 'succeeded' => $this->redis->sCard($this->toKey('succeeded')) ?? 0, + 'failed' => $this->redis->sCard($this->toKey('failed')) ?? 0, + 'delayed' => $this->redis->zCard($this->toKey('delayed')) ?? 0, + 'newestJob' => $this->redis->get($this->toKey('id')) ?? 0, + ]; + return $results; + } }