Jelajahi Sumber

Se agrega symfony/lock y se pasa a string el index de onus.

Maxi Schvindt 7 tahun lalu
induk
melakukan
b83cbcb763

+ 5 - 4
composer.json

@@ -183,7 +183,6 @@
         "doctrine/doctrine-cache-bundle": "^1.2",
         "doctrine/doctrine-migrations-bundle": "^1.2",
         "doctrine/orm": "^2.5",
-        "jdorn/sql-formatter": "~1.2.17",
         "ik/audit-bundle": "dev-master",
         "ik/auth-bundle": "dev-master",
         "ik/base-admin-bundle": "dev-master",
@@ -195,17 +194,18 @@
         "ik/owner-voter-bundle": "dev-master",
         "ik/redis-bundle": "dev-master",
         "ik/stats/base-stats-bundle": "dev-master",
+        "ik/stats/cmts-bundle": "dev-master",
         "ik/stats/fiberhome-bundle": "dev-master",
+        "ik/stats/fiberlink-bundle": "dev-master",
         "ik/stats/geoserver-bundle": "dev-master",
         "ik/stats/huawei-bundle": "dev-master",
-        "ik/stats/fiberlink-bundle": "dev-master",
+        "ik/stats/nas-bundle": "dev-master",
         "ik/stats/zte-bundle": "dev-master",
         "ik/statsd-bundle": "dev-master",
         "ik/webservice-bundle": "dev-master",
         "ik/workflow-bundle": "dev-master",
-        "ik/stats/nas-bundle": "dev-master",
-        "ik/stats/cmts-bundle": "dev-master",
         "incenteev/composer-parameter-handler": "^2.0",
+        "jdorn/sql-formatter": "~1.2.17",
         "jms/serializer": "^1.9.0",
         "jms/serializer-bundle": "^1.5.0",
         "kriswallsmith/assetic": "^1.4",
@@ -217,6 +217,7 @@
         "sonata-project/doctrine-orm-admin-bundle": "^3.1",
         "stof/doctrine-extensions-bundle": "^1.2",
         "symfony/assetic-bundle": "^2.8",
+        "symfony/lock": "^3.4",
         "symfony/monolog-bundle": "^3.1.0",
         "symfony/polyfill-apcu": "^1.0",
         "symfony/swiftmailer-bundle": "^2.3.10",

+ 68 - 6
composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "content-hash": "8f676b92b712fa5a4624cf7d4bf311c2",
+    "content-hash": "5cb1ba1ca712a546481afa060bff24e2",
     "packages": [
         {
             "name": "behat/transliterator",
@@ -1814,7 +1814,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/WorkflowBundle.git",
-                "reference": "02e9a07ebe7c40417f4e78c451e26a893abc9164"
+                "reference": "bd577e702f687cceafb370131d60916ecc2b6976"
             },
             "require": {
                 "php-amqplib/rabbitmq-bundle": "^1.12"
@@ -1844,7 +1844,7 @@
                 "bundle",
                 "workflow"
             ],
-            "time": "2018-04-05T14:41:00+00:00"
+            "time": "2018-04-25T14:53:54+00:00"
         },
         {
             "name": "incenteev/composer-parameter-handler",
@@ -4093,6 +4093,68 @@
             ],
             "time": "2015-12-28T13:12:39+00:00"
         },
+        {
+            "name": "symfony/lock",
+            "version": "v3.4.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/lock.git",
+                "reference": "d7b8a52eed987bfa163aba175f3192dda07f120c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://satis.infra.flowdat.com/dist/symfony/lock/symfony-lock-d7b8a52eed987bfa163aba175f3192dda07f120c-zip-d8ce16.zip",
+                "reference": "d7b8a52eed987bfa163aba175f3192dda07f120c",
+                "shasum": "576d56e6a7cfb89d5a19d6174803fb2c23d95ca5"
+            },
+            "require": {
+                "php": "^5.5.9|>=7.0.8",
+                "psr/log": "~1.0",
+                "symfony/polyfill-php70": "~1.0"
+            },
+            "require-dev": {
+                "predis/predis": "~1.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.4-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Lock\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                },
+                {
+                    "name": "Jérémy Derussé",
+                    "email": "jeremy@derusse.com"
+                }
+            ],
+            "description": "Symfony Lock Component",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "cas",
+                "flock",
+                "locking",
+                "mutex",
+                "redlock",
+                "semaphore"
+            ],
+            "time": "2017-11-22T12:18:49+00:00"
+        },
         {
             "name": "symfony/monolog-bundle",
             "version": "v3.1.0",
@@ -6491,16 +6553,16 @@
         "ik/owner-voter-bundle": 20,
         "ik/redis-bundle": 20,
         "ik/stats/base-stats-bundle": 20,
+        "ik/stats/cmts-bundle": 20,
         "ik/stats/fiberhome-bundle": 20,
+        "ik/stats/fiberlink-bundle": 20,
         "ik/stats/geoserver-bundle": 20,
         "ik/stats/huawei-bundle": 20,
-        "ik/stats/fiberlink-bundle": 20,
+        "ik/stats/nas-bundle": 20,
         "ik/stats/zte-bundle": 20,
         "ik/statsd-bundle": 20,
         "ik/webservice-bundle": 20,
         "ik/workflow-bundle": 20,
-        "ik/stats/nas-bundle": 20,
-        "ik/stats/cmts-bundle": 20,
         "opensolutions/oss-snmp": 20,
         "sonata-project/admin-bundle": 20,
         "voryx/restgeneratorbundle": 20

+ 2 - 2
src/StatsBundle/Command/StatsOnuCommand.php

@@ -98,7 +98,7 @@ class StatsOnuCommand extends BaseCommand
             $row['lat'] = ($lat)?$lat:"NULL";
             $row['lng'] = ($lng)?$lng:"NULL";
             
-            $row['index'] = $index;
+            $row['index'] = "'$index'";
 
             if(isset($bandwidth[$lowSn])) {
                 $row['inOctets'] = $bandwidth[$lowSn]['inBand'];
@@ -175,7 +175,7 @@ class StatsOnuCommand extends BaseCommand
 
         $rx = array();
         foreach ($ponsCached as $index => $data) {
-            if($data['rxPower']) {
+            if(isset($data['rxPower'])) {
                 foreach($data['rxPower'] as $i => $value) {
                     $ponPort = $data['ponPort']."/".$i;
                     $rx[$ponPort] = $value;

+ 5 - 3
src/StatsBundle/Entity/Onu.php

@@ -30,7 +30,9 @@ class Onu implements TenancyIdTraitInterface
     private $id;
 
     /**
-     * @ORM\Column(type="integer", nullable=true)
+     * @var string
+     *
+     * @ORM\Column(type="string", length=250, nullable=true)
      */
     private $index;
 
@@ -576,7 +578,7 @@ class Onu implements TenancyIdTraitInterface
     /**
      * Set index
      *
-     * @param integer $index
+     * @param string $index
      *
      * @return ONU
      */
@@ -590,7 +592,7 @@ class Onu implements TenancyIdTraitInterface
     /**
      * Get index
      *
-     * @return integer
+     * @return string
      */
     public function getIndex()
     {