Browse Source

Merged in FD3-389 (pull request #61)

FD3-389

Approved-by: Guillermo Espinoza <guillermo@interlink.com.ar>
Gabriel Gosparo 7 years ago
parent
commit
a4d34be3ab

+ 10 - 5
app/config/config_dev.yml

@@ -21,14 +21,19 @@ web_profiler:
 monolog:
     handlers:
         main:
-            type: stream
-            path: "%kernel.logs_dir%/%kernel.environment%.log"
+            type:         group
+            action_level: error
+            members:      [nested, amqp]
+        nested:
+            type:  stream
+            path:  "%kernel.logs_dir%/%kernel.environment%.log"
             level: debug
-            channels: [!event]
-            formatter : backtrace_formatter
+        amqp:
+            type:               service
+            id:                 monolog.amqp
+            level:              debug
         console:
             type:   console
-            channels: [!event, !doctrine]
         # 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"

+ 3 - 4
src/FTTHBundle/Controller/ONUController.php

@@ -146,9 +146,8 @@ class ONUController extends Controller
             $location->setMapId($mapId);
 
             $em->persist($location);
-            
-            $object->setUpdated(new \DateTime());
 
+            $object->setUpdated(new \DateTime());
             $return[] = "LOCATION (id {$location->getId()}) {$action} - ONU (id {$object->getId()}) {$onu['text']} - " . json_encode($mapLocation);
         }
 
@@ -217,7 +216,7 @@ class ONUController extends Controller
         foreach ($napsQuery as $nap) {
             if ($nap->getExtraData() != null) {
                 $nap->setContainer($this->container);
-                // Seteamos la direcci�n - direcci�n o null
+                // Seteamos la dirección - direccion o null
                 $address = $nap->getData('address');
                 $dataNap = [
                     'id' => $nap->getId(),
@@ -258,7 +257,7 @@ class ONUController extends Controller
                     'slot' => $nap->getSlot(),
                     'link' => $nap->getLink()
                 ];
-                $naps[$nap->getId()] = $dataNap;    
+                $naps[$nap->getId()] = $dataNap;
             }
         }
         return $naps;

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

@@ -44,7 +44,7 @@ filter:
     label_slot: Slot
     label_link: Link
     label_address: Dirección
-
+    
 breadcrumb:
     link_o_n_u_list: Listado ONU
     link_o_n_u_create: Crear ONU
@@ -64,7 +64,7 @@ breadcrumb:
     link_profile_list: Listado Perfiles
     link_profile_create: Crear Perfil
     link_profile_delete: Eliminar Perfil
-
+    
 form:
     label_id: Id
     label_ip: Ip
@@ -186,7 +186,7 @@ show:
     label_link: Link
     label_enable: Enable
     label_address: Dirección
-
+    
 helps:
     check_address: Verifique la dirección para el cálculo de distancias.
 error: