ccommon: pelikan - add stats for memcache klog

RB_ID=750660
twitter · Oct 4, 2015 · 4a96b0e · 4a96b0e
1 parent d1fdbf3
commit 4a96b0e
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 16 deletions.
diff --git a/include/cc_log.h b/include/cc_log.h
@@ -77,7 +77,9 @@ void log_destroy(struct logger **logger);
 
 rstatus_t log_reopen(struct logger *logger);
 
-void _log_write(struct logger *logger, char *buf, int len);
+/* _log_write returns true if msg written, false if skipped or failed */
+bool _log_write(struct logger *logger, char *buf, int len);
+
 void _log_fd(int fd, const char *fmt, ...);
 
 void log_flush(struct logger *logger);

diff --git a/src/cc_log.c b/src/cc_log.c
@@ -162,36 +162,36 @@ log_reopen(struct logger *logger)
     return CC_OK;
 }
 
-void
+bool
 _log_write(struct logger *logger, char *buf, int len)
 {
-    int n;
-
     if (logger->buf != NULL) {
-        n = rbuf_write(logger->buf, buf, len);
+        if (rbuf_wcap(logger->buf) >= len) {
+            rbuf_write(logger->buf, buf, len);
+            INCR(log_metrics, log_write);
+            INCR_N(log_metrics, log_write_byte, len);
+        } else {
+            INCR(log_metrics, log_skip);
+            INCR_N(log_metrics, log_skip_byte, len);
+            return false;
+        }
     } else {
         if (logger->fd < 0) {
             INCR(log_metrics, log_write_ex);
-            return;
+            return false;
         }
 
-        n = write(logger->fd, buf, len);
-
-        if (n < 0) {
+        if (write(logger->fd, buf, len) < len) {
             INCR(log_metrics, log_write_ex);
             logger->nerror++;
-            return;
+            return false;
         }
-    }
 
-    if (n < len) {
-        INCR(log_metrics, log_skip);
-        INCR_N(log_metrics, log_skip_byte, len - n);
-        logger->nerror++;
-    } else {
         INCR(log_metrics, log_write);
         INCR_N(log_metrics, log_write_byte, len);
     }
+
+    return true;
 }
 
 void