浏览代码

Agregado de monolog para que envie mensajes a rabbit

gabriel 7 年之前
父节点
当前提交
2c2c55470b

+ 16 - 6
app/config/config_dev.yml

@@ -19,16 +19,26 @@ web_profiler:
     intercept_redirects: false
 
 monolog:
+    channels: ['devicelog', 'webservice']
     handlers:
         main:
-            type: stream
-            path: "%kernel.logs_dir%/%kernel.environment%.log"
+            type:         fingers_crossed
+            action_level: error
+            handler:      grouped
+        grouped:
+            type:         group
+            members:      [nested, amqp]
+        nested:
+            type:  stream
+            path:  "%kernel.logs_dir%/%kernel.environment%.log"
             level: debug
-            channels: [!event]
-            formatter : backtrace_formatter
         console:
-            type:   console
-            channels: [!event, !doctrine]
+            type:  console
+        amqp:
+            type: service
+            id: monolog.amqp
+            level: debug
+            channels: ['devicelog', 'webservice']
         # uncomment to get logging in your browser
         # you may have to allow bigger header sizes in your Web server configuration
         #firephp:

+ 4 - 1
app/config/config_prod.yml

@@ -14,7 +14,10 @@ monolog:
         main:
             type:         fingers_crossed
             action_level: error
-            handler:      nested
+            handler:      grouped
+        grouped:
+            type:         group
+            members:      [nested, amqp]
         nested:
             type:  stream
             path:  "%kernel.logs_dir%/%kernel.environment%.log"

+ 15 - 2
src/FTTHBundle/Controller/ONUController.php

@@ -211,7 +211,7 @@ class ONUController extends Controller
         $without_olt = $translator->trans("without_olt", array(), "FTTHBundle");
         $out_of_range = " [" . $translator->trans("out_of_range", array(), "FTTHBundle") . "]";
         $onu_distance_nap_not_configurated = " [" . $translator->trans("onu_distance_nap_not_configurated", array(), "FTTHBundle") . "]";
-        $onu_not_positioned = " [" . $translator->trans("onu_not_positioned", array(), "FTTHBundle") . "]";
+        $nap_not_positioned = " [" . $translator->trans("nap_not_positioned", array(), "FTTHBundle") . "]";
         foreach ($napsQuery as $nap) {
             if ($nap->getExtraData() != null) {
                 $nap->setContainer($this->container);
@@ -241,9 +241,22 @@ class ONUController extends Controller
                         $dataNap['distanceMessage'] = $onu_distance_nap_not_configurated;
                     }
                 } else {
-                    $dataNap['distanceMessage'] = $onu_not_positioned;
+                    $dataNap['distanceMessage'] = $nap_not_positioned;
                 }
                 $naps[$nap->getId()] = $dataNap;
+            } else {
+                $dataNap = [
+                    'id' => $nap->getId(),
+                    'name' => $nap->getName(),
+                    'distance' => -1,
+                    'distanceMessage' => $nap_not_positioned,
+                    'freePort' => $nap->getFreePort(),
+                    'address' => '',
+                    'olt' => $nap->getOlt() == null ? $without_olt : $nap->getOlt()->getName(),
+                    'slot' => $nap->getSlot(),
+                    'link' => $nap->getLink()
+                ];
+                $naps[$nap->getId()] = $dataNap;
             }
         }
         return $naps;

+ 1 - 1
src/FTTHBundle/Resources/translations/FTTHBundle.es.yml

@@ -208,4 +208,4 @@ Address: Dirección
 out_of_range: FUERA DE RANGO
 without_olt: SIN OLT
 onu_distance_nap_not_configurated: Requiere configuración de distancia
-onu_not_positioned: ONU no posicionada
+nap_not_positioned: NAP no posicionada