forked from brett19/php-couchbase
-
Notifications
You must be signed in to change notification settings - Fork 40
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
PCBC-410: consolidate LCB and extension logging
Change-Id: Ia116a628efc977072d1c5abf600f1c181a847833 Reviewed-on: http://review.couchbase.org/67006 Tested-by: buildbot <build@couchbase.com> Reviewed-by: Sergey Avseyev <sergey.avseyev@gmail.com>
- Loading branch information
Showing
21 changed files
with
257 additions
and
44 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| # -*- mode: yaml; -*- | ||
|
|
||
| BasedOnStyle: LLVM | ||
| IndentWidth: 4 | ||
| BreakBeforeBraces: Linux |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,96 @@ | ||
| /** | ||
| * Copyright 2016 Couchbase, Inc. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| #include <libcouchbase/couchbase.h> | ||
| #include <php.h> | ||
|
|
||
| #include "zap.h" | ||
| #include "log.h" | ||
|
|
||
| static const char *level_to_string(int severity) | ||
| { | ||
| switch (severity) { | ||
| case LCB_LOG_TRACE: | ||
| return "TRAC"; | ||
| case LCB_LOG_DEBUG: | ||
| return "DEBG"; | ||
| case LCB_LOG_INFO: | ||
| return "INFO"; | ||
| case LCB_LOG_WARN: | ||
| return "WARN"; | ||
| case LCB_LOG_ERROR: | ||
| return "EROR"; | ||
| case LCB_LOG_FATAL: | ||
| return "FATL"; | ||
| default: | ||
| return ""; | ||
| } | ||
| } | ||
|
|
||
| static void log_handler(struct lcb_logprocs_st *procs, unsigned int iid, | ||
| const char *subsys, int severity, const char *srcfile, | ||
| int srcline, const char *fmt, va_list ap) | ||
| { | ||
| struct pcbc_logger_st *logger = (struct pcbc_logger_st *)procs; | ||
| char *buf = NULL; | ||
| char *msg = NULL; | ||
| TSRMLS_FETCH(); | ||
|
|
||
| if (severity < logger->minlevel) { | ||
| return; | ||
| } | ||
|
|
||
| vspprintf(&msg, 0, fmt, ap); | ||
| spprintf(&buf, 0, "[cb,%s] (%s L:%d I:%d) %s", level_to_string(severity), | ||
| subsys, srcline, iid, msg); | ||
| efree(msg); | ||
| php_log_err(buf TSRMLS_CC); | ||
| efree(buf); | ||
| } | ||
|
|
||
| struct pcbc_logger_st pcbc_logger = { | ||
| {0 /* version */, {{log_handler} /* v1 */} /*v*/}, | ||
| /** Minimum severity */ | ||
| LCB_LOG_INFO}; | ||
|
|
||
| void pcbc_log(int severity, lcb_t instance, const char *subsys, | ||
| const char *srcfile, int srcline, const char *fmt, ...) | ||
| { | ||
| va_list ap; | ||
| char *msg = NULL; | ||
| char *buf = NULL; | ||
| TSRMLS_FETCH(); | ||
|
|
||
| if (severity < pcbc_logger.minlevel) { | ||
| return; | ||
| } | ||
|
|
||
| va_start(ap, fmt); | ||
| vspprintf(&msg, 0, fmt, ap); | ||
| va_end(ap); | ||
| if (instance) { | ||
| spprintf(&buf, 0, "[cb,%s] (%s L:%d) %s. I=%p", | ||
| level_to_string(severity), subsys, srcline, msg, | ||
| (void *)instance); | ||
| } else { | ||
| spprintf(&buf, 0, "[cb,%s] (%s L:%d) %s", level_to_string(severity), | ||
| subsys, srcline, msg); | ||
| } | ||
| efree(msg); | ||
|
|
||
| php_log_err(buf TSRMLS_CC); | ||
| efree(buf); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| /** | ||
| * Copyright 2016 Couchbase, Inc. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| #ifndef LOG_H_ | ||
| #define LOG_H_ | ||
|
|
||
| #include <libcouchbase/couchbase.h> | ||
| #include <php.h> | ||
|
|
||
| struct pcbc_logger_st { | ||
| struct lcb_logprocs_st base; | ||
| int minlevel; | ||
| }; | ||
|
|
||
| void pcbc_log(int severity, lcb_t instance, const char *subsys, | ||
| const char *srcfile, int srcline, const char *fmt, ...); | ||
|
|
||
| #endif // LOG_H_ |
Oops, something went wrong.