Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
colinmollenhour committed Aug 25, 2020
2 parents b501325 + 85935f0 commit 0d11428
Show file tree
Hide file tree
Showing 4 changed files with 311 additions and 18 deletions.
249 changes: 249 additions & 0 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
@@ -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
}
75 changes: 59 additions & 16 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
# Magento Module for advanced logging
<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
[![All Contributors](https://img.shields.io/badge/all_contributors-26-orange.svg?style=flat-square)](#contributors-)
<!-- ALL-CONTRIBUTORS-BADGE:END -->

The purpose of this project is to have a simple framework for different logging adapters.

Expand Down Expand Up @@ -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)):

<!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
<!-- prettier-ignore-start -->
<!-- markdownlint-disable -->
<table>
<tr>
<td align="center"><a href="http://colin.mollenhour.com/"><img src="https://avatars3.githubusercontent.com/u/38738?v=4" width="100px;" alt=""/><br /><sub><b>Colin Mollenhour</b></sub></a><br /><a href="https://github.com/firegento/firegento-logger/commits?author=colinmollenhour" title="Code">💻</a></td>
<td align="center"><a href="https://github.com/daim2k5"><img src="https://avatars3.githubusercontent.com/u/656150?v=4" width="100px;" alt=""/><br /><sub><b>Damian Luszczymak</b></sub></a><br /><a href="https://github.com/firegento/firegento-logger/commits?author=daim2k5" title="Code">💻</a></td>
<td align="center"><a href="https://rouven.io/"><img src="https://avatars3.githubusercontent.com/u/393419?v=4" width="100px;" alt=""/><br /><sub><b>Rouven Alexander Rieker</b></sub></a><br /><a href="https://github.com/firegento/firegento-logger/commits?author=therouv" title="Code">💻</a></td>
<td align="center"><a href="https://www.reachdigital.nl/"><img src="https://avatars2.githubusercontent.com/u/1244416?v=4" width="100px;" alt=""/><br /><sub><b>Paul Hachmang</b></sub></a><br /><a href="https://github.com/firegento/firegento-logger/commits?author=paales" title="Code">💻</a></td>
<td align="center"><a href="https://aelia.co/"><img src="https://avatars1.githubusercontent.com/u/292434?v=4" width="100px;" alt=""/><br /><sub><b>Diego</b></sub></a><br /><a href="https://github.com/firegento/firegento-logger/commits?author=daigo75" title="Code">💻</a></td>
<td align="center"><a href="http://www.ffuenf.de/"><img src="https://avatars3.githubusercontent.com/u/50462?v=4" width="100px;" alt=""/><br /><sub><b>Achim Rosenhagen</b></sub></a><br /><a href="https://github.com/firegento/firegento-logger/commits?author=arosenhagen" title="Code">💻</a></td>
<td align="center"><a href="http://www.fabian-blechschmidt.de/"><img src="https://avatars1.githubusercontent.com/u/379680?v=4" width="100px;" alt=""/><br /><sub><b>Fabian Blechschmidt</b></sub></a><br /><a href="https://github.com/firegento/firegento-logger/commits?author=Schrank" title="Code">💻</a></td>
</tr>
<tr>
<td align="center"><a href="https://www.hipex.io/"><img src="https://avatars1.githubusercontent.com/u/984466?v=4" width="100px;" alt=""/><br /><sub><b>Freek Gruntjes</b></sub></a><br /><a href="https://github.com/firegento/firegento-logger/commits?author=Fgruntjes" title="Code">💻</a></td>
<td align="center"><a href="https://www.sandstein.de/"><img src="https://avatars2.githubusercontent.com/u/23700116?v=4" width="100px;" alt=""/><br /><sub><b>Wilfried Wolf</b></sub></a><br /><a href="https://github.com/firegento/firegento-logger/commits?author=wilfriedwolf" title="Code">💻</a></td>
<td align="center"><a href="https://github.com/tkdb"><img src="https://avatars3.githubusercontent.com/u/5831065?v=4" width="100px;" alt=""/><br /><sub><b>tkdb</b></sub></a><br /><a href="https://github.com/firegento/firegento-logger/commits?author=tkdb" title="Code">💻</a></td>
<td align="center"><a href="https://www.diglin.com/"><img src="https://avatars2.githubusercontent.com/u/1337461?v=4" width="100px;" alt=""/><br /><sub><b>Sylvain Rayé</b></sub></a><br /><a href="https://github.com/firegento/firegento-logger/commits?author=sylvainraye" title="Code">💻</a></td>
<td align="center"><a href="http://www.mb-tec.eu/"><img src="https://avatars2.githubusercontent.com/u/13970869?v=4" width="100px;" alt=""/><br /><sub><b>Matthias Büsing</b></sub></a><br /><a href="https://github.com/firegento/firegento-logger/commits?author=mb-tec" title="Code">💻</a></td>
<td align="center"><a href="http://avidonline.co.nz/"><img src="https://avatars2.githubusercontent.com/u/924802?v=4" width="100px;" alt=""/><br /><sub><b>Dane Lowe</b></sub></a><br /><a href="https://github.com/firegento/firegento-logger/commits?author=danelowe" title="Code">💻</a></td>
<td align="center"><a href="https://github.com/LeeSaferite"><img src="https://avatars3.githubusercontent.com/u/47386?v=4" width="100px;" alt=""/><br /><sub><b>Lee Saferite</b></sub></a><br /><a href="https://github.com/firegento/firegento-logger/commits?author=LeeSaferite" title="Code">💻</a></td>
</tr>
<tr>
<td align="center"><a href="https://github.com/JeroenVanLeusden"><img src="https://avatars2.githubusercontent.com/u/14925052?v=4" width="100px;" alt=""/><br /><sub><b>Jeroen</b></sub></a><br /><a href="https://github.com/firegento/firegento-logger/commits?author=JeroenVanLeusden" title="Code">💻</a></td>
<td align="center"><a href="https://steverobbins.com/"><img src="https://avatars0.githubusercontent.com/u/3498562?v=4" width="100px;" alt=""/><br /><sub><b>Steve Robbins</b></sub></a><br /><a href="https://github.com/firegento/firegento-logger/commits?author=steverobbins" title="Code">💻</a></td>
<td align="center"><a href="https://github.com/sergeykalenyuk"><img src="https://avatars0.githubusercontent.com/u/1863773?v=4" width="100px;" alt=""/><br /><sub><b>Sergey Kalenyuk</b></sub></a><br /><a href="https://github.com/firegento/firegento-logger/commits?author=sergeykalenyuk" title="Code">💻</a></td>
<td align="center"><a href="https://github.com/nhp"><img src="https://avatars3.githubusercontent.com/u/512911?v=4" width="100px;" alt=""/><br /><sub><b>Nils Preuß</b></sub></a><br /><a href="https://github.com/firegento/firegento-logger/commits?author=nhp" title="Code">💻</a></td>
<td align="center"><a href="https://www.matthias-zeis.com/"><img src="https://avatars2.githubusercontent.com/u/371060?v=4" width="100px;" alt=""/><br /><sub><b>Matthias Zeis</b></sub></a><br /><a href="https://github.com/firegento/firegento-logger/commits?author=mzeis" title="Code">💻</a></td>
<td align="center"><a href="http://www.jeroenvermeulen.eu/"><img src="https://avatars1.githubusercontent.com/u/658024?v=4" width="100px;" alt=""/><br /><sub><b>Jeroen Vermeulen</b></sub></a><br /><a href="https://github.com/firegento/firegento-logger/commits?author=jeroenvermeulen" title="Code">💻</a></td>
<td align="center"><a href="https://github.com/infabo"><img src="https://avatars0.githubusercontent.com/u/3999104?v=4" width="100px;" alt=""/><br /><sub><b>Ingo Fabbri</b></sub></a><br /><a href="https://github.com/firegento/firegento-logger/commits?author=infabo" title="Code">💻</a></td>
</tr>
<tr>
<td align="center"><a href="https://www.colinodell.com/"><img src="https://avatars1.githubusercontent.com/u/202034?v=4" width="100px;" alt=""/><br /><sub><b>Colin O'Dell</b></sub></a><br /><a href="https://github.com/firegento/firegento-logger/commits?author=colinodell" title="Code">💻</a></td>
<td align="center"><a href="https://www.mothership.de/"><img src="https://avatars1.githubusercontent.com/u/1199310?v=4" width="100px;" alt=""/><br /><sub><b>Andreas</b></sub></a><br /><a href="https://github.com/firegento/firegento-logger/commits?author=andreasemer" title="Code">💻</a></td>
<td align="center"><a href="http://www.aadmathijssen.nl/"><img src="https://avatars0.githubusercontent.com/u/3796971?v=4" width="100px;" alt=""/><br /><sub><b>Aad Mathijssen</b></sub></a><br /><a href="https://github.com/firegento/firegento-logger/commits?author=aadmathijssen" title="Code">💻</a></td>
<td align="center"><a href="http://www.proxiblue.com.au/"><img src="https://avatars2.githubusercontent.com/u/4994260?v=4" width="100px;" alt=""/><br /><sub><b>Lucas van Staden</b></sub></a><br /><a href="https://github.com/firegento/firegento-logger/commits?author=ProxiBlue" title="Code">💻</a></td>
<td align="center"><a href="https://github.com/kkrieger85"><img src="https://avatars2.githubusercontent.com/u/4435523?v=4" width="100px;" alt=""/><br /><sub><b>Kevin Krieger</b></sub></a><br /><a href="https://github.com/firegento/firegento-logger/commits?author=kkrieger85" title="Documentation">📖</a></td>
</tr>
</table>

<!-- markdownlint-enable -->
<!-- prettier-ignore-end -->
<!-- ALL-CONTRIBUTORS-LIST:END -->

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**!
Expand Down Expand Up @@ -122,3 +164,4 @@ is send to the client
Licence
-------
[GNU General Public License, version 3 (GPLv3)](http://opensource.org/licenses/gpl-3.0)

4 changes: 2 additions & 2 deletions src/app/code/community/FireGento/Logger/Helper/Data.php
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ public function getMappedTargets($filename)
}
}
}
$this->_targetMap = $targetMap;
$this->_targetMap = $targets;
} else {
$this->_targetMap = false;
}
Expand Down Expand Up @@ -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());
Expand Down
1 change: 1 addition & 0 deletions src/app/code/community/FireGento/Logger/Model/Sentry.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 0d11428

Please sign in to comment.