Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
W
wp-logs
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
wpdesk
wp-logs
Commits
5482c28a
Commit
5482c28a
authored
6 years ago
by
dyszczo
Browse files
Options
Downloads
Patches
Plain Diff
PB-587 Fatal przy nadawaniu przesyłki - multiple wc capture
parent
59dd4a5a
Branches
Branches containing commit
Tags
1.5.4
Tags containing commit
1 merge request
!12
PB-587 Fatal przy nadawaniu przesyłki - multiple wc capture
Pipeline
#6736
failed
6 years ago
Stage: tools
Stage: tests
Stage: pre-deploy
Stage: deploy
Changes
3
Pipelines
2
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
CHANGELOG.md
+4
-0
4 additions, 0 deletions
CHANGELOG.md
src/WC/WooCommerceMonologPlugin.php
+1
-1
1 addition, 1 deletion
src/WC/WooCommerceMonologPlugin.php
src/WPDeskLoggerFactory.php
+3
-2
3 additions, 2 deletions
src/WPDeskLoggerFactory.php
with
8 additions
and
3 deletions
CHANGELOG.md
+
4
−
0
View file @
5482c28a
## [1.5.4] - 2019-05-06
### Fixed
-
Exception: must be an instance of WC_Logger, instance of WPDesk
\L
ogger
\W
C
\W
ooCommerceMonologPlugin given
## [1.5.3] - 2019-04-25
## [1.5.3] - 2019-04-25
### Fixed
### Fixed
-
Exception while trying to disable log
-
Exception while trying to disable log
...
...
This diff is collapsed.
Click to expand it.
src/WC/WooCommerceMonologPlugin.php
+
1
−
1
View file @
5482c28a
...
@@ -21,7 +21,7 @@ class WooCommerceMonologPlugin implements \WC_Logger_Interface
...
@@ -21,7 +21,7 @@ class WooCommerceMonologPlugin implements \WC_Logger_Interface
/** @var \WC_Logger */
/** @var \WC_Logger */
private
$originalWCLogger
;
private
$originalWCLogger
;
public
function
__construct
(
Logger
$monolog
,
\WC_Logger
$originalLogger
)
public
function
__construct
(
Logger
$monolog
,
\WC_Logger
_Interface
$originalLogger
)
{
{
$this
->
monolog
=
$monolog
;
$this
->
monolog
=
$monolog
;
$this
->
originalWCLogger
=
$originalLogger
;
$this
->
originalWCLogger
=
$originalLogger
;
...
...
This diff is collapsed.
Click to expand it.
src/WPDeskLoggerFactory.php
+
3
−
2
View file @
5482c28a
...
@@ -69,7 +69,7 @@ class WPDeskLoggerFactory extends BasicLoggerFactory
...
@@ -69,7 +69,7 @@ class WPDeskLoggerFactory extends BasicLoggerFactory
* Assumptions:
* Assumptions:
* - logger is actively working when 'wpdesk_helper_options' has 'debug_log' set to '1';
* - logger is actively working when 'wpdesk_helper_options' has 'debug_log' set to '1';
* - fatal errors, exception and standard errors are recorded but in a transparent way;
* - fatal errors, exception and standard errors are recorded but in a transparent way;
* - WooCommerce logger is captured and returns this logger;
* - WooCommerce logger is captured and returns this logger;
That is true of default logger is instantiated.
* - logs are still correctly written to WooCommerce subsystem in a transparent way;
* - logs are still correctly written to WooCommerce subsystem in a transparent way;
* - all recorded errors are written to WPDesk file.
* - all recorded errors are written to WPDesk file.
*
*
...
@@ -87,10 +87,11 @@ class WPDeskLoggerFactory extends BasicLoggerFactory
...
@@ -87,10 +87,11 @@ class WPDeskLoggerFactory extends BasicLoggerFactory
}
}
$logger
=
$this
->
createLogger
(
$name
);
$logger
=
$this
->
createLogger
(
$name
);
$this
->
captureWooCommerce
(
$logger
);
$this
->
appendMainLog
(
$logger
);
$this
->
appendMainLog
(
$logger
);
if
(
$name
!==
self
::
DEFAULT_LOGGER_CHANNEL_NAME
)
{
if
(
$name
!==
self
::
DEFAULT_LOGGER_CHANNEL_NAME
)
{
$this
->
appendFileLog
(
$logger
,
$this
->
getFileName
(
$name
));
$this
->
appendFileLog
(
$logger
,
$this
->
getFileName
(
$name
));
}
else
{
$this
->
captureWooCommerce
(
$logger
);
}
}
return
$logger
;
return
$logger
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment