Merge pull request #170 from BaranekD/logging_modifications

fix: Each log has just one line output

Author: vyskocilpavel

CHANGELOG.md

@@ -6,6 +6,7 @@ All notable changes to this project will be documented in this file.
 - Detailed endpoint format when spaced in EndpointMapToArray 
 - Revert change to INDEX_MIN in EndpointMapToArray
 - Rename the hook correctly to naming convention
+- Each log has just one line output
 
 ## [v5.2.0]
 #### Added

lib/AdapterLdap.php

@@ -390,7 +390,7 @@ public function getUsersGroupsOnFacility($spEntityId, $userId)
             '(&(objectClass=perunResource)(perunFacilityDn=perunFacilityId=' . $id . ',' . $this->ldapBase . '))',
             ['perunResourceId']
         );
-        Logger::debug('Resources - ' . var_export($resources, true));
+        Logger::debug('Resources - ' . json_encode($resources));
 
         if ($resources === null) {
             throw new Exception(
@@ -424,7 +424,7 @@ public function getUsersGroupsOnFacility($spEntityId, $userId)
             );
         }
         $resultGroups = $this->removeDuplicateEntities($resultGroups);
-        Logger::debug('Groups - ' . var_export($resultGroups, true));
+        Logger::debug('Groups - ' . json_encode($resultGroups));
         return $resultGroups;
     }
 

lib/Auth/Process/ForceAup.php

@@ -205,7 +205,7 @@ public function process(&$request)
             $newAups = [];
         }
 
-        Logger::debug('perun:ForceAup - NewAups: ' . print_r($newAups, true));
+        Logger::debug('perun:ForceAup - NewAups: ' . json_encode($newAups));
 
         if (!empty($newAups)) {
             $request[self::UID_ATTR] = $this->uidAttr;

lib/Auth/Process/PerunIdentity.php

@@ -574,10 +574,10 @@ protected function getVosForRegistration($user)
 
         $vos = $this->getVosByFacilityVoShortNames();
         foreach ($vos as $vo) {
-            Logger::debug('Vo:' . print_r($vo, true));
+            Logger::debug('Vo:' . json_encode($vo));
             try {
                 $member = $this->rpcAdapter->getMemberByUser($user, $vo);
-                Logger::debug('Member:' . print_r($member, true));
+                Logger::debug('Member:' . json_encode($member));
                 array_push($members, $member);
             } catch (\Exception $exception) {
                 array_push($vosForRegistration, $vo);
@@ -597,7 +597,7 @@ protected function getVosForRegistration($user)
                 array_push($vosForRegistration, $vo);
             }
         }
-        Logger::debug('VOs for registration:  ' . print_r($vosForRegistration, true));
+        Logger::debug('VOs for registration:  ' . json_encode($vosForRegistration));
         return $vosForRegistration;
     }
 

lib/LdapConnector.php

@@ -111,7 +111,7 @@ protected function search($base, $filter, $attributes = null)
         }
 
         ldap_set_option($conn, LDAP_OPT_PROTOCOL_VERSION, 3);
-        
+
         // Enable TLS, if needed
         if ($this->enableTLS && stripos($this->hostname, "ldaps:") === false) {
             if (!@ldap_start_tls($conn)) {
@@ -142,7 +142,7 @@ protected function search($base, $filter, $attributes = null)
         ldap_close($conn);
 
         Logger::debug('sspmod_perun_LdapConnector.search - search query proceeded in ' . $responseTime . 'ms. ' .
-            'Query base: ' . $base . ', filter: ' . $filter . ', response: ' . var_export($entries, true));
+            'Query base: ' . $base . ', filter: ' . $filter . ', response: ' . json_encode($entries));
 
         return $entries;
     }