diff --git a/.all-contributorsrc b/.all-contributorsrc new file mode 100644 index 00000000..60022f1d --- /dev/null +++ b/.all-contributorsrc @@ -0,0 +1,249 @@ +{ + "projectName": "firegento-logger", + "projectOwner": "firegento", + "repoType": "github", + "repoHost": "https://github.com", + "files": [ + "README.md" + ], + "imageSize": 100, + "commit": true, + "commitConvention": "none", + "contributors": [ + { + "login": "colinmollenhour", + "name": "Colin Mollenhour", + "avatar_url": "https://avatars3.githubusercontent.com/u/38738?v=4", + "profile": "http://colin.mollenhour.com/", + "contributions": [ + "code" + ] + }, + { + "login": "daim2k5", + "name": "Damian Luszczymak", + "avatar_url": "https://avatars3.githubusercontent.com/u/656150?v=4", + "profile": "https://github.com/daim2k5", + "contributions": [ + "code" + ] + }, + { + "login": "therouv", + "name": "Rouven Alexander Rieker", + "avatar_url": "https://avatars3.githubusercontent.com/u/393419?v=4", + "profile": "https://rouven.io/", + "contributions": [ + "code" + ] + }, + { + "login": "paales", + "name": "Paul Hachmang", + "avatar_url": "https://avatars2.githubusercontent.com/u/1244416?v=4", + "profile": "https://www.reachdigital.nl/", + "contributions": [ + "code" + ] + }, + { + "login": "daigo75", + "name": "Diego", + "avatar_url": "https://avatars1.githubusercontent.com/u/292434?v=4", + "profile": "https://aelia.co/", + "contributions": [ + "code" + ] + }, + { + "login": "arosenhagen", + "name": "Achim Rosenhagen", + "avatar_url": "https://avatars3.githubusercontent.com/u/50462?v=4", + "profile": "http://www.ffuenf.de/", + "contributions": [ + "code" + ] + }, + { + "login": "Schrank", + "name": "Fabian Blechschmidt", + "avatar_url": "https://avatars1.githubusercontent.com/u/379680?v=4", + "profile": "http://www.fabian-blechschmidt.de/", + "contributions": [ + "code" + ] + }, + { + "login": "Fgruntjes", + "name": "Freek Gruntjes", + "avatar_url": "https://avatars1.githubusercontent.com/u/984466?v=4", + "profile": "https://www.hipex.io/", + "contributions": [ + "code" + ] + }, + { + "login": "wilfriedwolf", + "name": "Wilfried Wolf", + "avatar_url": "https://avatars2.githubusercontent.com/u/23700116?v=4", + "profile": "https://www.sandstein.de/", + "contributions": [ + "code" + ] + }, + { + "login": "tkdb", + "name": "tkdb", + "avatar_url": "https://avatars3.githubusercontent.com/u/5831065?v=4", + "profile": "https://github.com/tkdb", + "contributions": [ + "code" + ] + }, + { + "login": "sylvainraye", + "name": "Sylvain Rayé", + "avatar_url": "https://avatars2.githubusercontent.com/u/1337461?v=4", + "profile": "https://www.diglin.com/", + "contributions": [ + "code" + ] + }, + { + "login": "mb-tec", + "name": "Matthias Büsing", + "avatar_url": "https://avatars2.githubusercontent.com/u/13970869?v=4", + "profile": "http://www.mb-tec.eu/", + "contributions": [ + "code" + ] + }, + { + "login": "danelowe", + "name": "Dane Lowe", + "avatar_url": "https://avatars2.githubusercontent.com/u/924802?v=4", + "profile": "http://avidonline.co.nz/", + "contributions": [ + "code" + ] + }, + { + "login": "LeeSaferite", + "name": "Lee Saferite", + "avatar_url": "https://avatars3.githubusercontent.com/u/47386?v=4", + "profile": "https://github.com/LeeSaferite", + "contributions": [ + "code" + ] + }, + { + "login": "JeroenVanLeusden", + "name": "Jeroen", + "avatar_url": "https://avatars2.githubusercontent.com/u/14925052?v=4", + "profile": "https://github.com/JeroenVanLeusden", + "contributions": [ + "code" + ] + }, + { + "login": "steverobbins", + "name": "Steve Robbins", + "avatar_url": "https://avatars0.githubusercontent.com/u/3498562?v=4", + "profile": "https://steverobbins.com/", + "contributions": [ + "code" + ] + }, + { + "login": "sergeykalenyuk", + "name": "Sergey Kalenyuk", + "avatar_url": "https://avatars0.githubusercontent.com/u/1863773?v=4", + "profile": "https://github.com/sergeykalenyuk", + "contributions": [ + "code" + ] + }, + { + "login": "nhp", + "name": "Nils Preuß", + "avatar_url": "https://avatars3.githubusercontent.com/u/512911?v=4", + "profile": "https://github.com/nhp", + "contributions": [ + "code" + ] + }, + { + "login": "mzeis", + "name": "Matthias Zeis", + "avatar_url": "https://avatars2.githubusercontent.com/u/371060?v=4", + "profile": "https://www.matthias-zeis.com/", + "contributions": [ + "code" + ] + }, + { + "login": "jeroenvermeulen", + "name": "Jeroen Vermeulen", + "avatar_url": "https://avatars1.githubusercontent.com/u/658024?v=4", + "profile": "http://www.jeroenvermeulen.eu/", + "contributions": [ + "code" + ] + }, + { + "login": "infabo", + "name": "Ingo Fabbri", + "avatar_url": "https://avatars0.githubusercontent.com/u/3999104?v=4", + "profile": "https://github.com/infabo", + "contributions": [ + "code" + ] + }, + { + "login": "colinodell", + "name": "Colin O'Dell", + "avatar_url": "https://avatars1.githubusercontent.com/u/202034?v=4", + "profile": "https://www.colinodell.com/", + "contributions": [ + "code" + ] + }, + { + "login": "andreasemer", + "name": "Andreas", + "avatar_url": "https://avatars1.githubusercontent.com/u/1199310?v=4", + "profile": "https://www.mothership.de/", + "contributions": [ + "code" + ] + }, + { + "login": "aadmathijssen", + "name": "Aad Mathijssen", + "avatar_url": "https://avatars0.githubusercontent.com/u/3796971?v=4", + "profile": "http://www.aadmathijssen.nl/", + "contributions": [ + "code" + ] + }, + { + "login": "ProxiBlue", + "name": "Lucas van Staden", + "avatar_url": "https://avatars2.githubusercontent.com/u/4994260?v=4", + "profile": "http://www.proxiblue.com.au/", + "contributions": [ + "code" + ] + }, + { + "login": "kkrieger85", + "name": "Kevin Krieger", + "avatar_url": "https://avatars2.githubusercontent.com/u/4435523?v=4", + "profile": "https://github.com/kkrieger85", + "contributions": [ + "doc" + ] + } + ], + "contributorsPerLine": 7 +} diff --git a/README.md b/README.md index bf6636a5..c897af20 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,7 @@ # Magento Module for advanced logging + +[![All Contributors](https://img.shields.io/badge/all_contributors-26-orange.svg?style=flat-square)](#contributors-) + The purpose of this project is to have a simple framework for different logging adapters. @@ -63,36 +66,75 @@ Configure the different loggers in `System > Configuration > Advanced > Firegent ## Further Information -### Contributors - -* Karl Spies -* Christoph -* Christian -* Claas -* Damian Luszczymak -* Colin -* Marco Becker -* Nicolai Essig -* Daniel Kröger -* Michael Ryvlin -* Tobias Zander -* Achim Rosenhagen -* Lucas van Staden +### Contributors ✨ + +Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/docs/en/emoji-key)): + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

Colin Mollenhour
💻
Damian Luszczymak
💻
Rouven Alexander Rieker
💻
Paul Hachmang
💻
Diego
💻
Achim Rosenhagen
💻
Fabian Blechschmidt
💻

Freek Gruntjes
💻
Wilfried Wolf
💻
tkdb
💻
Sylvain Rayé
💻
Matthias Büsing
💻
Dane Lowe
💻
Lee Saferite
💻

Jeroen
💻
Steve Robbins
💻
Sergey Kalenyuk
💻
Nils Preuß
💻
Matthias Zeis
💻
Jeroen Vermeulen
💻
Ingo Fabbri
💻

Colin O'Dell
💻
Andreas
💻
Aad Mathijssen
💻
Lucas van Staden
💻
Kevin Krieger
📖
+ + + + + +This project follows the [all-contributors](https://github.com/all-contributors/all-contributors) specification. Contributions of any kind welcome! + ### Current Status of Project Complete, working logger interfaces: - File (Magento default) - File (Advanced Format) +- File (JSON) - E-Mail - Database - XMPP (Jabber, Google Talk) - Graylog2 -- RSyslog (UDP) - Loggly (UDP/HTTPS) +- Syslog +- RSyslog (UDP) - Papertrail (UDP) - Chromelogger - Logstash +- Redis +- Sentry - Airbrake It is possible to use **Multiple-Targets**! @@ -122,3 +164,4 @@ is send to the client Licence ------- [GNU General Public License, version 3 (GPLv3)](http://opensource.org/licenses/gpl-3.0) + diff --git a/src/app/code/community/FireGento/Logger/Helper/Data.php b/src/app/code/community/FireGento/Logger/Helper/Data.php index 85ee31d7..f32f0c63 100644 --- a/src/app/code/community/FireGento/Logger/Helper/Data.php +++ b/src/app/code/community/FireGento/Logger/Helper/Data.php @@ -106,7 +106,7 @@ public function getMappedTargets($filename) } } } - $this->_targetMap = $targetMap; + $this->_targetMap = $targets; } else { $this->_targetMap = false; } @@ -170,7 +170,7 @@ public function addEventMetadata(&$event, $notAvailable = null, $enableBacktrace ->setStoreCode(Mage::app()->getStore()->getCode()); // Add admin user data - if (Mage::app()->getStore()->isAdmin() && isset($_SESSION)) { + if (Mage::app()->getStore()->isAdmin() && isset($_SESSION['admin'])) { $session = Mage::getSingleton('admin/session'); if ($session->isLoggedIn()) { $event->setAdminUserId($session->getUser()->getId()); diff --git a/src/app/code/community/FireGento/Logger/Model/Sentry.php b/src/app/code/community/FireGento/Logger/Model/Sentry.php index f4c70b32..8d4e88d7 100644 --- a/src/app/code/community/FireGento/Logger/Model/Sentry.php +++ b/src/app/code/community/FireGento/Logger/Model/Sentry.php @@ -84,6 +84,7 @@ public function initRavenClient() $options = [ 'trace' => $this->_enableBacktrace, 'curl_method' => $helper->getLoggerConfig('sentry/curl_method'), + 'prefixes' => [BP], ]; if ($environment = trim($helper->getLoggerConfig('sentry/environment'))) { $options['environment'] = $environment;