fustundag / awscw-custom-metrics

src/AWSCustomMetric/Plugin/DiskUsage.php

Spacing +4 added lines, -4 removed lines

@@ -33,19 +33,19 @@
         $osName = $this->diObj->getCommandRunner()->getReturnValue();
         switch ($osName) {
             case 'Darwin':
-                $this->diObj->getCommandRunner()->execute('/bin/df -k -l ' . $this->mountPoint . " | awk '{print $8}'");
+                $this->diObj->getCommandRunner()->execute('/bin/df -k -l '.$this->mountPoint." | awk '{print $8}'");
                 break;
             case 'Linux':
-                $this->diObj->getCommandRunner()->execute('/bin/df -k -l ' . $this->mountPoint . " | awk '{print $5}'");
+                $this->diObj->getCommandRunner()->execute('/bin/df -k -l '.$this->mountPoint." | awk '{print $5}'");
                 break;
             default:
-                $this->diObj->getCommandRunner()->execute('/bin/df -k -l ' . $this->mountPoint . " | awk '{print $5}'");
+                $this->diObj->getCommandRunner()->execute('/bin/df -k -l '.$this->mountPoint." | awk '{print $5}'");
                 break;
         }
 
         $diskUtil = intval($this->diObj->getCommandRunner()->getReturnValue());
         if ($diskUtil>0) {
-            return [ $this->createNewMetric('DiskUsage', 'Percent', $diskUtil) ];
+            return [$this->createNewMetric('DiskUsage', 'Percent', $diskUtil)];
         } else {
             return null;
         }

src/AWSCustomMetric/Plugin/HttpCheck.php

Spacing +8 added lines, -8 removed lines

@@ -30,11 +30,11 @@ 
 
     public function __construct(DI $diObj, $namespace = null, $cronExpression = '')
     {
-        self::$equalsFunc = function ($string, $needle) {
+        self::$equalsFunc = function($string, $needle) {
             return $string==$needle;
         };
 
-        self::$containsFunc = function ($string, $needle) {
+        self::$containsFunc = function($string, $needle) {
             return strpos($string, $needle)!==false;
         };
 
@@ -95,7 +95,7 @@ 
      */
     public function addHeader($header, $val)
     {
-        $this->headers[ $header ] = $val;
+        $this->headers[$header] = $val;
     }
 
     /**
@@ -103,7 +103,7 @@ 
      */
     public function removeHeader($header)
     {
-        unset($this->headers[ $header ]);
+        unset($this->headers[$header]);
     }
 
     /**
@@ -169,7 +169,7 @@ 
     public function setBodyToCheck($bodyToCheck, $checkFunc = null)
     {
         $this->bodyToCheck   = $bodyToCheck;
-        $this->bodyCheckFunc = $checkFunc?$checkFunc:self::$equalsFunc;
+        $this->bodyCheckFunc = $checkFunc ? $checkFunc : self::$equalsFunc;
     }
 
     /**
@@ -233,7 +233,7 @@ 
         if (!$this->url || !$this->method) {
             if ($this->diObj->getLogger()) {
                 $this->diObj->getLogger()->error(
-                    (!$this->url)?'Url is not defined to check!':'Method is not defined to check!'
+                    (!$this->url) ? 'Url is not defined to check!' : 'Method is not defined to check!'
                 );
             }
             return false;
@@ -245,7 +245,7 @@ 
                 'http_errors' => false,
                 'connect_timeout' => $this->timeout,
                 'timeout' => $this->timeout,
-                'on_stats' => function (TransferStats $stats) {
+                'on_stats' => function(TransferStats $stats) {
                     $this->responseTime = $stats->getTransferTime();
                 }
             ]);
@@ -259,7 +259,7 @@ 
             }
         } catch (\Exception $e) {
             if ($this->diObj->getLogger()) {
-                $this->diObj->getLogger()->error('Guzzle Http client thrown exception! Msg: ' . $e->getMessage());
+                $this->diObj->getLogger()->error('Guzzle Http client thrown exception! Msg: '.$e->getMessage());
             }
             return [$this->createNewMetric('HttpCheckFail', 'Count', 1)];
         }

src/AWSCustomMetric/Plugin/ServicePortCheck.php

Spacing +4 added lines, -4 removed lines

@@ -21,7 +21,7 @@ 
      */
     public function getServiceName()
     {
-        return $this->serviceName?:$this->server . ':' . $this->port;
+        return $this->serviceName ?: $this->server.':'.$this->port;
     }
 
     /**
@@ -74,17 +74,17 @@ 
             if ($fp) {
                 fclose($fp);
                 return [
-                    $this->createNewMetric($this->getServiceName() . 'CheckFail', 'Count', 0)
+                    $this->createNewMetric($this->getServiceName().'CheckFail', 'Count', 0)
                 ];
             }
         } catch (\Exception $e) {
             if ($this->diObj->getLogger()) {
                 $this->diObj->getLogger()->error(
                     'Service port check thrown exception!'
-                    .' Service:' . $this->getServiceName() . ', Msg: ' . $e->getMessage()
+                    .' Service:'.$this->getServiceName().', Msg: '.$e->getMessage()
                 );
             }
         }
-        return [$this->createNewMetric($this->getServiceName() . 'CheckFail', 'Count', 1)];
+        return [$this->createNewMetric($this->getServiceName().'CheckFail', 'Count', 1)];
     }
 }

src/AWSCustomMetric/Plugin/MemcachedCheck.php

Spacing +1 added lines, -1 removed lines

@@ -102,7 +102,7 @@
             }
         } catch (\Exception $e) {
             if ($this->diObj->getLogger()) {
-                $this->diObj->getLogger()->error('Memcached client thrown exception! ExcpMsg: ' . $e->getMessage());
+                $this->diObj->getLogger()->error('Memcached client thrown exception! ExcpMsg: '.$e->getMessage());
             }
             return [
                 $this->createNewMetric('MemcachedCheckFail', 'Count', 1)

src/AWSCustomMetric/Sender.php

Spacing +2 added lines, -2 removed lines

@@ -237,11 +237,11 @@
                 'MetricName' => $metric->getName(),
                 'Unit' => $metric->getUnit(),
                 'Value' => $metric->getValue(),
-                'Timestamp' => gmdate('Y-m-d') . 'T' . gmdate('H:i:s') . 'Z'
+                'Timestamp' => gmdate('Y-m-d').'T'.gmdate('H:i:s').'Z'
             ];
         }
         $this->cloudWatchClient->putMetricData([
-            'Namespace'  => $namespace?:$this->getNamespace(),
+            'Namespace'  => $namespace ?: $this->getNamespace(),
             'MetricData' => $metricData
         ]);
     }

src/AWSCustomMetric/Logger/DefaultLogger.php

Spacing +3 added lines, -3 removed lines

@@ -6,16 +6,16 @@
 {
     public function debug($msg)
     {
-        echo "[".date('Y-m-d H:i:s')."][DEBUG] " . $msg . "\n";
+        echo "[".date('Y-m-d H:i:s')."][DEBUG] ".$msg."\n";
     }
 
     public function info($msg)
     {
-        echo "[".date('Y-m-d H:i:s')."][INFO] " . $msg . "\n";
+        echo "[".date('Y-m-d H:i:s')."][INFO] ".$msg."\n";
     }
 
     public function error($msg)
     {
-        echo "[".date('Y-m-d H:i:s')."][ERROR] " . $msg . "\n";
+        echo "[".date('Y-m-d H:i:s')."][ERROR] ".$msg."\n";
     }
 }

src/AWSCustomMetric/DI.php

Spacing +2 added lines, -2 removed lines

@@ -28,10 +28,10 @@
         $action  = substr($name, 0, 3);
         $objName = substr($name, 3);
         if ($action=='set') {
-            $this->objList[ $objName ] = $arguments[0];
+            $this->objList[$objName] = $arguments[0];
             return true;
         } else {
-            return isset($this->objList[ $objName ])?$this->objList[ $objName ]:null;
+            return isset($this->objList[$objName]) ? $this->objList[$objName] : null;
         }
     }
 }

src/AWSCustomMetric/Plugin/RedisCheck.php

Doc Comments +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
     }
 
     /**
-     * @return mixed
+     * @return string
      */
     public function getServer()
     {

Spacing +12 added lines, -12 removed lines

@@ -52,12 +52,12 @@ 
 
     private function getServerPortArgs()
     {
-        return '-h ' . $this->getServer() . ' -p ' . $this->getPort();
+        return '-h '.$this->getServer().' -p '.$this->getPort();
     }
 
     private function getRedisCliCmd()
     {
-        return '/usr/bin/redis-cli ' . $this->getServerPortArgs();
+        return '/usr/bin/redis-cli '.$this->getServerPortArgs();
     }
 
     /**
@@ -82,28 +82,28 @@ 
     private function findKeys()
     {
         try {
-            $this->diObj->getCommandRunner()->execute($this->getRedisCliCmd() . ' --raw dbsize');
+            $this->diObj->getCommandRunner()->execute($this->getRedisCliCmd().' --raw dbsize');
             $retVal = $this->diObj->getCommandRunner()->getReturnCode();
             $redisKeyCount = $this->diObj->getCommandRunner()->getOutput();
 
             if ($retVal!==0) {
                 if ($this->diObj->getLogger()) {
                     $this->diObj->getLogger()->error(
-                        'Redis KEyCount cmd failed!, RETVAL: ' . $retVal
-                        . ', OUT: ' . implode('|', $redisKeyCount)
+                        'Redis KEyCount cmd failed!, RETVAL: '.$retVal
+                        . ', OUT: '.implode('|', $redisKeyCount)
                     );
                 }
                 return false;
             }
             if ($redisKeyCount[0]>0) {
-                $this->diObj->getCommandRunner()->execute($this->getRedisCliCmd() . ' --raw keys *');
+                $this->diObj->getCommandRunner()->execute($this->getRedisCliCmd().' --raw keys *');
                 $retVal = $this->diObj->getCommandRunner()->getReturnCode();
                 $redisKeyList = $this->diObj->getCommandRunner()->getOutput();
                 if ($retVal!==0) {
                     if ($this->diObj->getLogger()) {
                         $this->diObj->getLogger()->error(
-                            'Redis KeyList cmd failed!, RETVAL: ' . $retVal
-                            . ', OUT: ' . implode('|', $redisKeyList)
+                            'Redis KeyList cmd failed!, RETVAL: '.$retVal
+                            . ', OUT: '.implode('|', $redisKeyList)
                         );
                     }
                     return false;
@@ -114,7 +114,7 @@ 
             }
         } catch (\Exception $e) {
             if ($this->diObj->getLogger()) {
-                $this->diObj->getLogger()->error('Redis client thrown exception! ExcpMsg: ' . $e->getMessage());
+                $this->diObj->getLogger()->error('Redis client thrown exception! ExcpMsg: '.$e->getMessage());
             }
             return false;
         }
@@ -126,12 +126,12 @@ 
     public function getMetrics()
     {
         try {
-            $redisKeyList = count($this->keys)==0?$this->findKeys():$this->keys;
+            $redisKeyList = count($this->keys)==0 ? $this->findKeys() : $this->keys;
             $totalLen     = 0;
             if ($redisKeyList && is_array($redisKeyList)) {
                 foreach ($redisKeyList as $redisKey) {
                     $this->diObj->getCommandRunner()->execute(
-                        $this->getRedisCliCmd() . ' --raw llen ' . trim($redisKey)
+                        $this->getRedisCliCmd().' --raw llen '.trim($redisKey)
                     );
                     $retVal = $this->diObj->getCommandRunner()->getReturnCode();
                     $redisKeyLen = $this->diObj->getCommandRunner()->getOutput();
@@ -145,7 +145,7 @@ 
             ];
         } catch (\Exception $e) {
             if ($this->diObj->getLogger()) {
-                $this->diObj->getLogger()->error('Redis client thrown exception! ExcpMsg: ' . $e->getMessage());
+                $this->diObj->getLogger()->error('Redis client thrown exception! ExcpMsg: '.$e->getMessage());
             }
             return false;
         }

src/AWSCustomMetric/Plugin/FileWatch.php

Spacing +11 added lines, -11 removed lines

@@ -60,7 +60,7 @@ 
      */
     public function addPattern($pattern, $isRegExp = false)
     {
-        $this->patterns[ $pattern ] = $isRegExp;
+        $this->patterns[$pattern] = $isRegExp;
     }
 
     /**
@@ -68,7 +68,7 @@ 
      */
     public function removePattern($pattern)
     {
-        unset($this->patterns[ $pattern ]);
+        unset($this->patterns[$pattern]);
     }
 
     /**
@@ -92,7 +92,7 @@ 
         if ($matchedCount>0 && $this->diObj->getLogger()) {
             $this->diObj->getLogger()->error(
                 'FileWatch found matched line!'
-                .' LINE >>> ' . $line . ' <<<'
+                .' LINE >>> '.$line.' <<<'
             );
         }
         return $matchedCount;
@@ -105,12 +105,12 @@ 
     {
         try {
             if (is_file($this->fileToWatch)===false) {
-                throw new \Exception("File to watch \"". $this->fileToWatch ."\" not found!");
+                throw new \Exception("File to watch \"".$this->fileToWatch."\" not found!");
             }
 
             clearstatcache(true);
-            $checkPointFile = $this->checkPointFile?:$this->fileToWatch . '.checkpoint';
-            $checkPoint     = is_file($checkPointFile)?intval(file_get_contents($checkPointFile)):0;
+            $checkPointFile = $this->checkPointFile ?: $this->fileToWatch.'.checkpoint';
+            $checkPoint     = is_file($checkPointFile) ?intval(file_get_contents($checkPointFile)) : 0;
             $fileSize       = filesize($this->fileToWatch);
             if ($fileSize==0) {
                 return [
@@ -122,17 +122,17 @@ 
             }
             $fp = fopen($this->fileToWatch, 'r');
             if (!$fp) {
-                throw new \Exception("File to watch \"". $this->fileToWatch ."\" could not opened for read!");
+                throw new \Exception("File to watch \"".$this->fileToWatch."\" could not opened for read!");
             }
             $seekStatus = fseek($fp, $checkPoint);
             if ($seekStatus==-1) {
-                throw new \Exception("Seek to \"". $checkPoint ."\" failed for \"". $this->fileToWatch ."\"!");
+                throw new \Exception("Seek to \"".$checkPoint."\" failed for \"".$this->fileToWatch."\"!");
             }
 
             $newCheckPoint      = $checkPoint;
             $foundPatternsCount = 0;
-            while (($line = fgets($fp)) !== false) {
-                if (($newCheckPoint+strlen($line))>$fileSize) {
+            while (($line = fgets($fp))!==false) {
+                if (($newCheckPoint + strlen($line))>$fileSize) {
                     break;
                 }
                 $foundPatternsCount += $this->checkLine($line);
@@ -146,7 +146,7 @@ 
             ];
         } catch (\Exception $e) {
             if ($this->diObj->getLogger()) {
-                $this->diObj->getLogger()->error('FileWatch thrown exception! ExcpMsg: ' . $e->getMessage());
+                $this->diObj->getLogger()->error('FileWatch thrown exception! ExcpMsg: '.$e->getMessage());
             }
             return [
                 $this->createNewMetric('FileWatchException', 'Count', 1)