Use redis client provider to connect to redis. #206

config/services.yaml

@@ -66,16 +66,13 @@ services:
 
     App\Service\MQTTClient:
         arguments:
-            $ip_address: "%env(MQTT_IP_ADDRESS)%"
+            $redis_client: "@App\\Service\\RedisClientProvider"
-            $port: "%env(MQTT_PORT)%"
-            $cert: "%env(MQTT_CERT)%"
 
     App\Service\APNSClient:
         arguments:
-            $ip_address: "%env(APNS_REDIS_IP_ADDRESS)%"
+            $redis_client: "@App\\Service\\RedisClientProvider"
-            $port: "%env(APNS_REDIS_PORT)%"
 
-    App\Service\RedisClient:
+    App\Service\RedisClientProvider:
         arguments:
             $scheme: "%env(REDIS_CLIENT_SCHEME)%"
             $host: "%env(REDIS_CLIENT_HOST)%"

src/Service/APNSClient.php

@@ -5,7 +5,6 @@ namespace App\Service;
 use Mosquitto\Client as MosquittoClient;
 use App\Entity\JobOrder;
 use App\Ramcar\MobileOSType;
-use Redis;
 
 class APNSClient
 {
@@ -14,16 +13,15 @@ class APNSClient
     // protected $mclient;
     protected $redis;
 
-    public function __construct($ip_address, $port)
+    public function __construct(RedisClientProvider $redis_client)
     {
-        $this->redis = new Redis();
+        $this->redis = $redis_client->getRedisClient();
-        $this->redis->connect($ip_address, $port);
     }
 
-	public function __destruct()
+    public function __destruct()
-	{
+    {
         // $this->mclient->disconnect();
-	}
+    }
 
     public function push($token, $message)
     {

src/Service/HubCounter.php

@@ -15,10 +15,10 @@ class HubCounter
     protected $em;
     protected $redis;
 
-    public function __construct(EntityManagerInterface $em, RedisClient $rc)
+    public function __construct(EntityManagerInterface $em, RedisClientProvider $redis_client)
     {
         $this->em = $em;
-        $this->redis = $rc->getRedisClient();
+        $this->redis = $redis_client->getRedisClient();
     }
 
     // get rider key based on id

src/Service/MQTTClient.php

@@ -4,7 +4,6 @@ namespace App\Service;
 
 use Mosquitto\Client as MosquittoClient;
 use App\Entity\JobOrder;
-use Redis;
 
 class MQTTClient
 {
@@ -15,27 +14,15 @@ class MQTTClient
     // protected $mclient;
     protected $redis;
 
-    public function __construct($ip_address, $port, $cert)
+    public function __construct(RedisClientProvider $redis_client)
     {
-        // we use redis now
+        $this->redis = $redis_client->getRedisClient();
-        // we have an mqtt server listening on redis and sending to mqtt
-        $this->redis = new Redis();
-        $this->redis->connect('127.0.0.1', 6379);
-
-        /*
-        error_log("connecting to mqtt server - $ip_address : $port");
-        error_log("using $cert");
-        $this->mclient = new MosquittoClient();
-		$this->mclient->setTlsCertificates($cert);
-		$this->mclient->setTlsOptions(MosquittoClient::SSL_VERIFY_NONE, 'tlsv1');
-        $this->mclient->connect($ip_address, $port);
-        */
     }
 
-	public function __destruct()
+    public function __destruct()
-	{
+    {
         // $this->mclient->disconnect();
-	}
+    }
 
     public function publish($channel, $message)
     {

src/Service/RedisClientProvider.php

@@ -4,7 +4,7 @@ namespace App\Service;
 
 use Predis\Client as PredisClient;
 
-class RedisClient
+class RedisClientProvider
 {
     protected $redis;
     protected $scheme;