mirror/php-monolog
1
0
Fork 0
mirror of https://github.com/Seldaek/monolog.git synced 2025-02-24 06:52:34 +01:00
Code Issues Releases Wiki Activity
1,039 Commits 3 Branches 84 Tags
Commit Graph

1039 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jordi Boggiano
3e1b8a7afe Remove code duplication, refs #435 2014-12-28 16:28:20 +00:00
Jordi Boggiano
33ebc242eb Merge remote-tracking branch 'scuben/enhanced-slack-handler' 2014-12-28 16:12:30 +00:00
Jordi Boggiano
515a096c86 Prevent header injection through content type / encoding in NativeMailerHandler, fixes #458, closes #448 2014-12-28 14:32:10 +00:00
Jordi Boggiano
5bee6fe56c Fix syslog transport to follow the spec closer, fixes #476 2014-12-17 10:47:08 +00:00
Jordi Boggiano
ebd0f73fbe Merge pull request #475 from tPl0ch/hotfix-normalizer-formatter 
Normalize frames for trace items since they can contain invalid data.
 2014-12-16 12:52:39 +00:00
Thomas Ploch
50b6bf45d1 Use different testing pattern for PHP 5.4 and PHP 5.5 2014-12-16 13:46:06 +01:00
Thomas Ploch
e66ba56cc0 Fixed array() usage and added HHVM_VERSION check 2014-12-16 13:35:22 +01:00
Thomas Ploch
dca8f5841f Normalize frames for trace items since they can contain invalid data. 
Refs https://github.com/Seldaek/monolog/pull/474/files

The fix in the previous PR did not take into account that there might be object wrapped resources that would break json_encode, so the best solution would be normalizing those frames again.

@Seldaek Sorry for the inconvenience, but our graylog is still ramming up with those json_encode error messages.
 2014-12-16 13:26:24 +01:00
Jordi Boggiano
2d192b0567 Skip test in hhvm 2014-12-16 11:04:16 +00:00
Jordi Boggiano
d7561931a5 Attempt to fix hhvm build 2014-12-16 10:34:35 +00:00
Jordi Boggiano
7db9d6ef4a Remove reference use, refs #474 2014-12-16 10:23:16 +00:00
Jordi Boggiano
07974d92c4 Merge remote-tracking branch 'tPl0ch/hotfix-resource-internal-function' 2014-12-16 10:21:25 +00:00
Thomas Ploch
00bfec630a Recursively check for resource arguments if trace is coming from internal function. 
With `React` or `Guzzle`, that register stream wrappers with PHP, the traces are treated as coming from internal functions with no line and file inside the frame. But they almost always contain resources as arguments, on which the `json_encode()` call will choke (probably this should be addressed in json_encode internally, since it is very easy to cast a resource to a string).

I added a test case proving the situation and a pretty basic recursive checker for resources which just casts them as a string into the frame again.
 2014-12-16 10:13:12 +01:00
Jordi Boggiano
a6e82ad0f7 Merge pull request #473 from tPl0ch/hotfix-gelf-formatter 
Added missing check for array key in `GelfMessageFormatter`
 2014-12-15 21:41:51 +00:00
Jordi Boggiano
1cb39eedb5 Allow including stack traces in line formatter, fixes #466 2014-12-13 13:54:24 +00:00
Thomas Ploch
9c78c9764a Added missing check for array key in GelfMessageFormatter 2014-12-12 10:38:40 +01:00
Jordi Boggiano
3d2567a2f1 Merge pull request #467 from tiagowbpr/master 
Php docs small error
 2014-12-06 18:16:08 +00:00
tiagowbpr
59c52eeea5 Php docs small error 2014-12-05 23:46:37 -02:00
Jordi Boggiano
4119844a43 Merge pull request #465 from kzooz/kzooz 
Add exception code
 2014-12-05 12:46:13 +00:00
Sergey Chizhik
21c54ac660 fix 2014-12-05 14:36:37 +02:00
Jordi Boggiano
cbbd378b32 Merge pull request #459 from adamnicholson/master 
Fix to ensure API response isn't output directly when using MandrillHandler
 2014-12-05 11:03:40 +00:00
Sergey Chizhik
7902b8c396 Add exception code 2014-12-04 18:42:38 +02:00
Jordi Boggiano
673e275c00 Update comments 2014-12-04 15:11:17 +00:00
Jordi Boggiano
09c28e1a45 Merge remote-tracking branch 'edsonmedina/master' 2014-12-04 15:09:24 +00:00
Edson Medina
ae68665460 getLevelName needs to be called earlier, so it can still thrown 
exceptions for invalid levels even without a handler
 2014-12-02 23:51:28 +00:00
Edson Medina
38f8dc52de Avoid calling expensive methods before checking we need to 2014-12-02 22:07:18 +00:00
Adam Nicholson
00b16667d3 Updated MandrillHandler to set CURLOPT_RETURNTRANSFER to true to ensure the API response isn't output directly 2014-11-26 13:13:06 +00:00
Jordi Boggiano
ab41ed9a94 Merge pull request #453 from mnapoli/patch-1 
Removed version constraint from the Installation doc
 2014-11-11 12:05:51 +00:00
Matthieu Napoli
316dc9c565 Removed version constraint from Installation doc 2014-11-11 17:02:24 +13:00
Jordi Boggiano
53c6cf358b Merge pull request #444 from JeroenDeDauw/patch-2 
Use FQN since class is not imported
 2014-10-29 06:32:01 +00:00
Jordi Boggiano
778a3e1401 Merge pull request #443 from JeroenDeDauw/patch-1 
Improve a grammar
 2014-10-29 06:31:45 +00:00
Jeroen De Dauw
6595e39ec8 Use FQN since class is not imported 2014-10-28 13:39:01 +01:00
Jeroen De Dauw
06b96795f6 Improve a grammar 2014-10-28 13:17:31 +01:00
Jordi Boggiano
d0a9acbad0 Add install instructions 2014-10-21 21:10:18 +01:00
Jordi Boggiano
f835cd21e4 Make 5.3 compliant and faster call to wrapped logger, refs #437 2014-10-21 10:22:09 +01:00
Jordi Boggiano
77febae7de Merge remote-tracking branch 'michaelmoussa/psr-handler' 2014-10-21 10:17:43 +01:00
Michael Moussa
979be11760 Added PsrHandler 
This handler allows applications introducing Monolog to continue using
their existing PSR-3 compliant logger(s) in conjunction with the various
Monolog handlers available.
 2014-10-20 23:27:55 -04:00
Jordi Boggiano
b738a6c04c CS fixes 2014-10-17 19:12:45 +01:00
Patrick Landolt
20b56007ad added the option to include extra data and to chose for a smaller output but with the same information available 2014-10-14 10:53:50 +02:00
Jordi Boggiano
940cbe15ab Move the class off in the tests 2014-10-04 16:43:06 +01:00
Jordi Boggiano
1e47b2788a Merge pull request #430 from moderndeveloperllc/master 
NewRelicHandler: Account for arrays sent in context and extra parameters
 2014-10-04 12:53:35 +01:00
Jordi Boggiano
5b134e647e Merge pull request #432 from NAYZO/master 
Update JsonFormatter.php
 2014-10-04 12:50:33 +01:00
Ala Eddine Khefifi
49f01b6ff6 Update JsonFormatter.php 
It's more clear and proper this way to put all class constants on top.
 2014-10-04 12:39:13 +01:00
Jordi Boggiano
2bd58073fd Merge pull request #431 from NETZkultur/patch-1 
Updated the README.mdown
 2014-10-04 12:23:52 +01:00
NETZkultur
98556a885e Updated the README.mdown 
fixed a typo
 2014-10-01 09:08:28 +02:00
Mark Garrett
bc2d882967 Account for context and extra params that are sent as arrays (GitProcessor for one). New __construct param is optional and set to false to emulate current feature set. 2014-09-30 16:42:07 -05:00
Jordi Boggiano
ec3961874c Update changelog 1.11.0 2014-09-30 14:30:58 +01:00
Jordi Boggiano
d2ec7648d0 Move iconEmoji param upfront since Slack was never in a stable release 2014-09-30 14:28:08 +01:00
Jordi Boggiano
31358c858f Add missing license headers 2014-09-30 14:24:28 +01:00
Jordi Boggiano
feb19af2d4 Add support for PSR-3 levels to all public APIs accepting levels, fixes #421 2014-09-30 13:59:45 +01:00