diff --git a/conf/scope.yml b/conf/scope.yml
index bfb0bcbf2..3e9c1caa7 100644
--- a/conf/scope.yml
+++ b/conf/scope.yml
@@ -611,6 +611,26 @@ libscope:
     #
     level: warning
 
+    # Set buffer threshold of the in-memory queue
+    #   Type:     integer
+    #   Values:   (greater than zero) bytes
+    #   Default:  32768
+    #   Override: $SCOPE_LOG_BUFFER_THRESHOLD
+    #
+    # Threshold of raw data after reaching data will be flushed to log
+    #
+    buffer_threshold: 32768
+
+    # Set flush period in-memory queue
+    #   Type:     integer
+    #   Values:   (greater than zero) miliseconds
+    #   Default:  2000
+    #   Override: $SCOPE_LOG_FLUSH_PERIOD
+    #
+    # Period after data will be flushed to log
+    #
+    flush_period: 2000
+
     # Backend connection for logs
     #
     transport:
diff --git a/src/cfg.c b/src/cfg.c
index e7f819e09..6117f0a05 100644
--- a/src/cfg.c
+++ b/src/cfg.c
@@ -57,6 +57,8 @@ struct _config_t
 
     struct {
         cfg_log_level_t level;
+        unsigned long bufthreshold;
+        unsigned long flushperiod;
     } log;
 
     struct {
@@ -208,6 +210,8 @@ cfgCreateDefault()
     }
 
     c->log.level = DEFAULT_LOG_LEVEL;
+    c->log.bufthreshold = DEFAULT_LOG_MAX_AGG_BYTES;
+    c->log.flushperiod = DEFAULT_LOG_FLUSH_PERIOD_IN_MS;
 
     c->pay.enable = DEFAULT_PAYLOAD_ENABLE;
     c->pay.dir = (DEFAULT_PAYLOAD_DIR) ? strdup(DEFAULT_PAYLOAD_DIR) : NULL;
@@ -561,6 +565,18 @@ cfgLogLevel(config_t* cfg)
     return (cfg) ? cfg->log.level : DEFAULT_LOG_LEVEL;
 }
 
+unsigned long
+cfgLogBufThreshold(config_t* cfg)
+{
+    return (cfg) ? cfg->log.bufthreshold : DEFAULT_LOG_MAX_AGG_BYTES;
+}
+
+unsigned long
+cfgLogFlushPeriod(config_t* cfg)
+{
+    return (cfg) ? cfg->log.flushperiod : DEFAULT_LOG_FLUSH_PERIOD_IN_MS;
+}
+
 unsigned int
 cfgPayEnable(config_t *cfg)
 {
@@ -912,6 +928,20 @@ cfgLogLevelSet(config_t* cfg, cfg_log_level_t level)
     cfg->log.level = level;
 }
 
+void
+cfgLogBufThresholdSet(config_t* cfg, unsigned long threshold)
+{
+    if (!cfg) return;
+    cfg->log.bufthreshold = threshold;
+}
+
+void
+cfgLogFlushPeriodSet(config_t* cfg, unsigned long period)
+{
+    if (!cfg) return;
+    cfg->log.flushperiod = period;
+}
+
 void
 cfgPayEnableSet(config_t *cfg, unsigned int val)
 {
diff --git a/src/cfg.h b/src/cfg.h
index 4ff350ce2..c98741a99 100644
--- a/src/cfg.h
+++ b/src/cfg.h
@@ -43,6 +43,8 @@ const char*         cfgTransportTlsCACertPath(config_t *, which_transport_t);
 custom_tag_t**      cfgCustomTags(config_t*);
 const char*         cfgCustomTagValue(config_t*, const char*);
 cfg_log_level_t     cfgLogLevel(config_t*);
+unsigned long       cfgLogBufThreshold(config_t*);
+unsigned long       cfgLogFlushPeriod(config_t*);
 unsigned int        cfgPayEnable(config_t*);
 const char *        cfgPayDir(config_t*);
 const char *        cfgEvtFormatHeader(config_t *, int);
@@ -78,6 +80,8 @@ void                cfgTransportTlsValidateServerSet(config_t *, which_transport
 void                cfgTransportTlsCACertPathSet(config_t *, which_transport_t, const char *);
 void                cfgCustomTagAdd(config_t*, const char*, const char*);
 void                cfgLogLevelSet(config_t*, cfg_log_level_t);
+void                cfgLogBufThresholdSet(config_t*, unsigned long);
+void                cfgLogFlushPeriodSet(config_t*, unsigned long);
 void                cfgPayEnableSet(config_t*, unsigned int);
 void                cfgPayDirSet(config_t*, const char *);
 void                cfgEvtFormatHeaderSet(config_t *, const char *);
diff --git a/src/cfgutils.c b/src/cfgutils.c
index 2cb186899..42af56c43 100644
--- a/src/cfgutils.c
+++ b/src/cfgutils.c
@@ -44,6 +44,8 @@
 
 #define LIBSCOPE_NODE        "libscope"
 #define LOG_NODE                 "log"
+#define BUF_THRESHOLD_NODE           "bufthreshold"
+#define FLUSH_PERIOD_NODE            "flushperiod"
 #define LEVEL_NODE                   "level"
 #define TRANSPORT_NODE               "transport"
 #define SUMMARYPERIOD_NODE       "summaryperiod"
@@ -165,6 +167,8 @@ void cfgTransportTlsValidateServerSetFromStr(config_t *, which_transport_t, cons
 void cfgTransportTlsCACertPathSetFromStr(config_t *, which_transport_t, const char *);
 void cfgCustomTagAddFromStr(config_t*, const char*, const char*);
 void cfgLogLevelSetFromStr(config_t*, const char*);
+void cfgLogBufThresholdSetFromStr(config_t*, const char*);
+void cfgLogFlushPeriodSetFromStr(config_t*, const char*);
 void cfgPayEnableSetFromStr(config_t*, const char*);
 void cfgPayDirSetFromStr(config_t*, const char*);
 void cfgAuthTokenSetFromStr(config_t*, const char*);
@@ -455,6 +459,10 @@ processEnvStyleInput(config_t *cfg, const char *env_line)
         cfgMtcVerbositySetFromStr(cfg, value);
     } else if (!strcmp(env_name, "SCOPE_LOG_LEVEL")) {
         cfgLogLevelSetFromStr(cfg, value);
+    } else if (!strcmp(env_name, "SCOPE_LOG_BUFFER_THRESHOLD")) {
+        cfgLogBufThresholdSetFromStr(cfg, value);
+    } else if (!strcmp(env_name, "SCOPE_LOG_FLUSH_PERIOD")) {
+        cfgLogFlushPeriodSetFromStr(cfg, value);
     } else if (!strcmp(env_name, "SCOPE_METRIC_DEST")) {
         cfgTransportSetFromStr(cfg, CFG_MTC, value);
     } else if (!strcmp(env_name, "SCOPE_METRIC_TLS_ENABLE")) {
@@ -649,10 +657,8 @@ void
 cfgMtcStatsDMaxLenSetFromStr(config_t* cfg, const char* value)
 {
     if (!cfg || !value) return;
-    errno = 0;
-    char* endptr = NULL;
-    unsigned long x = strtoul(value, &endptr, 10);
-    if (errno || *endptr) return;
+    unsigned long x;
+    if (!strToUnsignedLong(value, &x)) return;
 
     cfgMtcStatsDMaxLenSet(cfg, x);
 }
@@ -661,10 +667,8 @@ void
 cfgMtcPeriodSetFromStr(config_t* cfg, const char* value)
 {
     if (!cfg || !value) return;
-    errno = 0;
-    char* endptr = NULL;
-    unsigned long x = strtoul(value, &endptr, 10);
-    if (errno || *endptr) return;
+    unsigned long x;
+    if (!strToUnsignedLong(value, &x)) return;
 
     cfgMtcPeriodSet(cfg, x);
 }
@@ -703,10 +707,8 @@ void
 cfgEvtRateLimitSetFromStr(config_t* cfg, const char* value)
 {
     if (!cfg || !value) return;
-    errno = 0;
-    char* endptr = NULL;
-    unsigned long x = strtoul(value, &endptr, 10);
-    if (errno || *endptr) return;
+    unsigned long x;
+    if (!strToUnsignedLong(value, &x)) return;
 
     cfgEvtRateLimitSet(cfg, x);
 }
@@ -757,10 +759,8 @@ void
 cfgMtcVerbositySetFromStr(config_t* cfg, const char* value)
 {
     if (!cfg || !value) return;
-    errno = 0;
-    char* endptr = NULL;
-    unsigned long x = strtoul(value, &endptr, 10);
-    if (errno || *endptr) return;
+    unsigned long x;
+    if (!strToUnsignedLong(value, &x)) return;
 
     cfgMtcVerbositySet(cfg, x);
 }
@@ -857,6 +857,24 @@ cfgLogLevelSetFromStr(config_t* cfg, const char* value)
     cfgLogLevelSet(cfg, strToVal(logLevelMap, value));
 }
 
+void
+cfgLogBufThresholdSetFromStr(config_t* cfg, const char* value)
+{
+    if (!cfg || !value) return;
+    unsigned long x;
+    if (!strToUnsignedLong(value, &x)) return;
+    cfgLogBufThresholdSet(cfg, x);
+}
+
+void
+cfgLogFlushPeriodSetFromStr(config_t* cfg, const char* value)
+{
+    if (!cfg || !value) return;
+    unsigned long x;
+    if (!strToUnsignedLong(value, &x)) return;
+    cfgLogFlushPeriodSet(cfg, x);
+}
+
 void
 cfgPayEnableSetFromStr(config_t* cfg, const char* value)
 {
@@ -947,6 +965,22 @@ processLevel(config_t* config, yaml_document_t* doc, yaml_node_t* node)
     if (value) free(value);
 }
 
+static void
+processBufThreshold(config_t* config, yaml_document_t* doc, yaml_node_t* node)
+{
+    char* value = stringVal(node);
+    cfgLogBufThresholdSetFromStr(config, value);
+    if (value) free(value);
+}
+
+static void
+processFlushPeriod(config_t* config, yaml_document_t* doc, yaml_node_t* node)
+{
+    char* value = stringVal(node);
+    cfgLogFlushPeriodSetFromStr(config, value);
+    if (value) free(value);
+}
+
 static void
 processTransportType(config_t* config, yaml_document_t* doc, yaml_node_t* node)
 {
@@ -1086,6 +1120,8 @@ processLogging(config_t* config, yaml_document_t* doc, yaml_node_t* node)
 
     parse_table_t t[] = {
         {YAML_SCALAR_NODE,    LEVEL_NODE,           processLevel},
+        {YAML_SCALAR_NODE,    BUF_THRESHOLD_NODE,   processBufThreshold},
+        {YAML_SCALAR_NODE,    FLUSH_PERIOD_NODE,    processFlushPeriod},
         {YAML_MAPPING_NODE,   TRANSPORT_NODE,       processTransportLog},
         {YAML_NO_NODE,        NULL,                 NULL}
     };
@@ -2121,6 +2157,10 @@ createLogJson(config_t* cfg)
     cJSON* transport;
 
     if (!(root = cJSON_CreateObject())) goto err;
+    if (!cJSON_AddNumberToObjLN(root, BUF_THRESHOLD_NODE,
+                      cfgLogBufThreshold(cfg))) goto err;
+    if (!cJSON_AddNumberToObjLN(root, FLUSH_PERIOD_NODE,
+                      cfgLogFlushPeriod(cfg))) goto err;
     if (!cJSON_AddStringToObjLN(root, LEVEL_NODE,
                      valToStr(logLevelMap, cfgLogLevel(cfg)))) goto err;
 
@@ -2549,7 +2589,7 @@ initEvtFormat(config_t *cfg)
 ctl_t *
 initCtl(config_t *cfg)
 {
-    ctl_t *ctl = ctlCreate();
+    ctl_t *ctl = ctlCreate(cfg);
     if (!ctl) return ctl;
 
     /*
diff --git a/src/ctl.c b/src/ctl.c
index 2258d1a0c..5a39b2c1d 100644
--- a/src/ctl.c
+++ b/src/ctl.c
@@ -14,8 +14,6 @@
 #include "state.h"
 
 #define FS_ENTRIES 1024
-#define DEFAULT_LOG_MAX_AGG_BYTES 32768
-#define DEFAULT_LOG_FLUSH_PERIOD_IN_MS 2000
 
 #define CHANNEL "_channel"
 #define ID "id"
@@ -570,7 +568,7 @@ ctlCreateTxMsg(upload_t *upld)
 }
 
 ctl_t *
-ctlCreate()
+ctlCreate(config_t *cfg)
 {
     ctl_t *ctl = calloc(1, sizeof(ctl_t));
     if (!ctl) {
@@ -583,8 +581,8 @@ ctlCreate()
         DBG(NULL);
         goto err;
     }
-    ctl->log.max_agg_bytes = DEFAULT_LOG_MAX_AGG_BYTES;
-    ctl->log.flush_period_in_ms = DEFAULT_LOG_FLUSH_PERIOD_IN_MS;
+    ctl->log.max_agg_bytes = cfgLogBufThreshold(cfg);
+    ctl->log.flush_period_in_ms = cfgLogFlushPeriod(cfg);
 
     ctl->events = cbufInit(DEFAULT_CBUF_SIZE);
     if (!ctl->events) {
diff --git a/src/ctl.h b/src/ctl.h
index 4f047e788..1c760c205 100644
--- a/src/ctl.h
+++ b/src/ctl.h
@@ -100,7 +100,7 @@ char *        ctlCreateTxMsg(upload_t*);
 typedef struct _ctl_t ctl_t;
 
 // Constructors Destructors
-ctl_t * ctlCreate();
+ctl_t * ctlCreate(config_t *);
 void    ctlDestroy(ctl_t **);
 
 // Raw Send (without messaging protocol)
diff --git a/src/scope_static.c b/src/scope_static.c
index 3d8738d6d..4c152c868 100644
--- a/src/scope_static.c
+++ b/src/scope_static.c
@@ -683,6 +683,12 @@ static const char scope_help_configuration[] =
 "        SCOPE_LOG_DEST\n"
 "            same format as SCOPE_METRIC_DEST above.\n"
 "            Default is file:///tmp/scope.log\n"
+"        SCOPE_LOG_BUFFER_THRESHOLD\n"
+"            threshold of flushing bytes from memory log queue.\n"
+"            Default is 32768 bytes.\n"
+"        SCOPE_LOG_FLUSH_PERIOD\n"
+"            period of flushing bytes from memory log queue.\n"
+"            Default is 2000 ms.\n"
 "        SCOPE_LOG_TLS_ENABLE\n"
 "            Flag to enable Transport Layer Security (TLS). Only affects\n"
 "            tcp:// destinations. true,false  Default is false.\n"
diff --git a/src/scopetypes.h b/src/scopetypes.h
index 6d947d26d..cfb828260 100644
--- a/src/scopetypes.h
+++ b/src/scopetypes.h
@@ -142,6 +142,8 @@ typedef unsigned int bool;
 #define DEFAULT_LOG_PORT NULL
 #define DEFAULT_LOG_PATH "/tmp/scope.log"
 #define DEFAULT_LOG_BUF CFG_BUFFER_LINE
+#define DEFAULT_LOG_MAX_AGG_BYTES 32768
+#define DEFAULT_LOG_FLUSH_PERIOD_IN_MS 2000
 #define DEFAULT_TLS_ENABLE FALSE
 #define DEFAULT_TLS_VALIDATE_SERVER TRUE
 #define DEFAULT_TLS_CA_CERT NULL
diff --git a/src/utils.c b/src/utils.c
index 5d1cf296f..c02e70daf 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -21,6 +21,16 @@ strToVal(enum_map_t map[], const char *str)
     return -1;
 }
 
+int
+strToUnsignedLong(const char* str, unsigned long* val)
+{
+    errno = 0;
+    char* endptr = NULL;
+    *val = strtoul(str, &endptr, 10);
+    if (errno || *endptr) return FALSE;
+    return TRUE;
+}
+
 const char *
 valToStr(enum_map_t map[], unsigned int val)
 {
diff --git a/src/utils.h b/src/utils.h
index cd92556d2..9bbfffff6 100644
--- a/src/utils.h
+++ b/src/utils.h
@@ -10,6 +10,7 @@ typedef struct {
 
 unsigned int strToVal(enum_map_t[], const char*);
 const char* valToStr(enum_map_t[], unsigned int);
+int strToUnsignedLong(const char* str, unsigned long* val);
 
 int checkEnv(char *, char *);
 int fullSetenv(const char *, const char *, int);
diff --git a/test/cfgtest.c b/test/cfgtest.c
index c1107c241..a831e0bd2 100644
--- a/test/cfgtest.c
+++ b/test/cfgtest.c
@@ -73,6 +73,8 @@ verifyDefaults(config_t* config)
     assert_null            (cfgCustomTags(config));
     assert_null            (cfgCustomTagValue(config, "tagname"));
     assert_int_equal       (cfgLogLevel(config), DEFAULT_LOG_LEVEL);
+    assert_int_equal       (cfgLogBufThreshold(config), DEFAULT_LOG_MAX_AGG_BYTES);
+    assert_int_equal       (cfgLogFlushPeriod(config), DEFAULT_LOG_FLUSH_PERIOD_IN_MS);
     assert_int_equal       (cfgPayEnable(config), DEFAULT_PAYLOAD_ENABLE);
     assert_string_equal    (cfgPayDir(config), DEFAULT_PAYLOAD_DIR);
 }
diff --git a/test/cfgutilstest.c b/test/cfgutilstest.c
index 9b4d43e47..fd389d593 100644
--- a/test/cfgutilstest.c
+++ b/test/cfgutilstest.c
@@ -1125,6 +1125,8 @@ verifyDefaults(config_t* config)
     assert_null            (cfgCustomTags(config));
     assert_null            (cfgCustomTagValue(config, "tagname"));
     assert_int_equal       (cfgLogLevel(config), DEFAULT_LOG_LEVEL);
+    assert_int_equal       (cfgLogBufThreshold(config), DEFAULT_LOG_MAX_AGG_BYTES);
+    assert_int_equal       (cfgLogFlushPeriod(config), DEFAULT_LOG_FLUSH_PERIOD_IN_MS);
     assert_int_equal       (cfgPayEnable(config), DEFAULT_PAYLOAD_ENABLE);
     assert_string_equal    (cfgPayDir(config), DEFAULT_PAYLOAD_DIR);
 
diff --git a/test/comtest.c b/test/comtest.c
index b4fdab51a..d2ce5774a 100644
--- a/test/comtest.c
+++ b/test/comtest.c
@@ -9,7 +9,8 @@
 static void
 cmdPostInfoMsgDoesNotCrash(void** state)
 {
-    ctl_t* ctl = ctlCreate();
+    config_t* cfg = cfgCreateDefault();
+    ctl_t* ctl = ctlCreate(cfg);
     assert_non_null(ctl);
 
     assert_int_equal(-1, cmdPostInfoMsg(NULL, NULL));
@@ -18,12 +19,14 @@ cmdPostInfoMsgDoesNotCrash(void** state)
     assert_int_equal(0, cmdPostInfoMsg(ctl, cJSON_CreateString("hey")));
 
     ctlDestroy(&ctl);
+    cfgDestroy(&cfg);
 }
 
 static void
 cmdSendInfoStrDoesNotCrash(void** state)
 {
-    ctl_t* ctl = ctlCreate();
+    config_t* cfg = cfgCreateDefault();
+    ctl_t* ctl = ctlCreate(cfg);
     assert_non_null(ctl);
 
     assert_int_equal(-1, cmdSendInfoStr(NULL, NULL));
@@ -32,12 +35,14 @@ cmdSendInfoStrDoesNotCrash(void** state)
     assert_int_equal(0, cmdSendInfoStr(ctl, "hey"));
 
     ctlDestroy(&ctl);
+    cfgDestroy(&cfg);
 }
 
 static void
 cmdSendResponseDoesNotCrash(void** state)
 {
-    ctl_t* ctl = ctlCreate();
+    config_t* cfg = cfgCreateDefault();
+    ctl_t* ctl = ctlCreate(cfg);
     assert_non_null(ctl);
     const char buf[] =
          "{\"type\": \"req\", \"req\": \"huh?\", \"reqId\": 3.5}";
@@ -53,6 +58,7 @@ cmdSendResponseDoesNotCrash(void** state)
 
     ctlDestroy(&ctl);
     destroyReq(&req);
+    cfgDestroy(&cfg);
 }
 
 static void
diff --git a/test/ctltest.c b/test/ctltest.c
index 87cd9525a..a3c76b2ba 100644
--- a/test/ctltest.c
+++ b/test/ctltest.c
@@ -259,6 +259,8 @@ ctlParseRxMsgSetCfg(void** state)
         "    \"summaryperiod\": \"13\",\n"
         "    \"log\": {\n"
         "      \"level\": \"debug\",\n"
+        "      \"bufthreshold\": \"32768\",\n"
+        "      \"flushperiod\": \"2000\",\n"
         "      \"transport\": {\n"
         "        \"type\": \"shm\"\n"
         "      }\n"
@@ -641,20 +643,23 @@ ctlSendMsgForNullMtcDoesntCrash(void** state)
 static void
 ctlSendMsgForNullMessageDoesntCrash(void** state)
 {
-    ctl_t* ctl = ctlCreate();
+    config_t* cfg = cfgCreateDefault();
+    ctl_t* ctl = ctlCreate(cfg);
     assert_non_null(ctl);
     transport_t* t = transportCreateSyslog();
     assert_non_null(t);
     ctlTransportSet(ctl, t, CFG_CTL);
     ctlSendMsg(ctl, NULL);
     ctlDestroy(&ctl);
+    cfgDestroy(&cfg);
 }
 
 static void
 ctlTransportSetAndMtcSend(void** state)
 {
     const char* file_path = "/tmp/my.path";
-    ctl_t* ctl = ctlCreate();
+    config_t* cfg = cfgCreateDefault();
+    ctl_t* ctl = ctlCreate(cfg);
     assert_non_null(ctl);
     transport_t* t1 = transportCreateUdp("127.0.0.1", "12345");
     transport_t* t2 = transportCreateUnix("/var/run/scope.sock");
@@ -693,6 +698,7 @@ ctlTransportSetAndMtcSend(void** state)
         fail_msg("Couldn't delete file %s", file_path);
 
     ctlDestroy(&ctl);
+    cfgDestroy(&cfg);
 }
 
 static void
@@ -736,7 +742,8 @@ ctlSendLogConsoleAsciiData(void **state)
                       .procname = "foo",
                       .cmd = "foo",
                       .id = "foo"};
-    ctl_t* ctl = ctlCreate();
+    config_t* cfg = cfgCreateDefault();
+    ctl_t* ctl = ctlCreate(cfg);
     assert_non_null(ctl);
     bool b_res = ctlEvtSourceEnabled(ctl, CFG_SRC_CONSOLE);
     assert_true(b_res);
@@ -747,6 +754,7 @@ ctlSendLogConsoleAsciiData(void **state)
     const char *val = get_cbuf_data();
     assert_string_equal(ascii_text, val);
     ctlDestroy(&ctl);
+    cfgDestroy(&cfg);
     allow_copy_buf_data(FALSE);
 }
 
@@ -769,7 +777,8 @@ ctlSendLogConsoleNoneAsciiData(void **state)
                       .procname = "foo",
                       .cmd = "foo",
                       .id = "foo"};
-    ctl_t* ctl = ctlCreate();
+    config_t* cfg = cfgCreateDefault();
+    ctl_t* ctl = ctlCreate(cfg);
     assert_non_null(ctl);
     bool b_res = ctlEvtSourceEnabled(ctl, CFG_SRC_CONSOLE);
     assert_true(b_res);
@@ -781,6 +790,7 @@ ctlSendLogConsoleNoneAsciiData(void **state)
     assert_string_equal(binary_data_event_msg, val);
     free(non_basic_ascii_text);
     ctlDestroy(&ctl);
+    cfgDestroy(&cfg);
     allow_copy_buf_data(FALSE);
 }
 
diff --git a/test/manual/fluentbit/services/nginx/config/scope.yml b/test/manual/fluentbit/services/nginx/config/scope.yml
index 567edc690..f78beadb6 100644
--- a/test/manual/fluentbit/services/nginx/config/scope.yml
+++ b/test/manual/fluentbit/services/nginx/config/scope.yml
@@ -599,6 +599,26 @@ libscope:
     #
     level: warning
 
+    # Set buffer threshold of the in-memory queue
+    #   Type:     integer
+    #   Values:   (greater than zero) bytes
+    #   Default:  32768
+    #   Override: $SCOPE_LOG_BUFFER_THRESHOLD
+    #
+    # Threshold of raw data after reaching data will be flushed to log
+    #
+    buffer_threshold: 32768
+
+    # Set flush period in-memory queue
+    #   Type:     integer
+    #   Values:   (greater than zero) miliseconds
+    #   Default:  2000
+    #   Override: $SCOPE_LOG_FLUSH_PERIOD
+    #
+    # Period after data will be flushed to log
+    #
+    flush_period: 2000
+
     # Backend connection for logs
     #
     transport:
diff --git a/test/manual/payload/conf_1/scope.yml b/test/manual/payload/conf_1/scope.yml
index e5e8229aa..e9bf5abe1 100644
--- a/test/manual/payload/conf_1/scope.yml
+++ b/test/manual/payload/conf_1/scope.yml
@@ -598,6 +598,26 @@ libscope:
     #
     level: warning
 
+    # Set buffer threshold of the in-memory queue
+    #   Type:     integer
+    #   Values:   (greater than zero) bytes
+    #   Default:  32768
+    #   Override: $SCOPE_LOG_BUFFER_THRESHOLD
+    #
+    # Threshold of raw data after reaching data will be flushed to log
+    #
+    buffer_threshold: 32768
+
+    # Set flush period in-memory queue
+    #   Type:     integer
+    #   Values:   (greater than zero) miliseconds
+    #   Default:  2000
+    #   Override: $SCOPE_LOG_FLUSH_PERIOD
+    #
+    # Period after data will be flushed to log
+    #
+    flush_period: 2000
+
     # Backend connection for logs
     #
     transport:
diff --git a/test/manual/payload/conf_2/scope.yml b/test/manual/payload/conf_2/scope.yml
index 6c274cd2a..3edc1976a 100644
--- a/test/manual/payload/conf_2/scope.yml
+++ b/test/manual/payload/conf_2/scope.yml
@@ -598,6 +598,26 @@ libscope:
     #
     level: warning
 
+    # Set buffer threshold of the in-memory queue
+    #   Type:     integer
+    #   Values:   (greater than zero) bytes
+    #   Default:  32768
+    #   Override: $SCOPE_LOG_BUFFER_THRESHOLD
+    #
+    # Threshold of raw data after reaching data will be flushed to log
+    #
+    buffer_threshold: 32768
+
+    # Set flush period in-memory queue
+    #   Type:     integer
+    #   Values:   (greater than zero) miliseconds
+    #   Default:  2000
+    #   Override: $SCOPE_LOG_FLUSH_PERIOD
+    #
+    # Period after data will be flushed to log
+    #
+    flush_period: 2000
+
     # Backend connection for logs
     #
     transport:
diff --git a/test/manual/payload/conf_3/scope.yml b/test/manual/payload/conf_3/scope.yml
index dcfec86a0..e2bb70497 100644
--- a/test/manual/payload/conf_3/scope.yml
+++ b/test/manual/payload/conf_3/scope.yml
@@ -598,6 +598,26 @@ libscope:
     #
     level: warning
 
+    # Set buffer threshold of the in-memory queue
+    #   Type:     integer
+    #   Values:   (greater than zero) bytes
+    #   Default:  32768
+    #   Override: $SCOPE_LOG_BUFFER_THRESHOLD
+    #
+    # Threshold of raw data after reaching data will be flushed to log
+    #
+    buffer_threshold: 32768
+
+    # Set flush period in-memory queue
+    #   Type:     integer
+    #   Values:   (greater than zero) miliseconds
+    #   Default:  2000
+    #   Override: $SCOPE_LOG_FLUSH_PERIOD
+    #
+    # Period after data will be flushed to log
+    #
+    flush_period: 2000
+
     # Backend connection for logs
     #
     transport:
diff --git a/test/manual/send_event/conf_1/scope.yml b/test/manual/send_event/conf_1/scope.yml
index 72c763a2d..434d2bce7 100644
--- a/test/manual/send_event/conf_1/scope.yml
+++ b/test/manual/send_event/conf_1/scope.yml
@@ -598,6 +598,26 @@ libscope:
     #
     level: warning
 
+    # Set buffer threshold of the in-memory queue
+    #   Type:     integer
+    #   Values:   (greater than zero) bytes
+    #   Default:  32768
+    #   Override: $SCOPE_LOG_BUFFER_THRESHOLD
+    #
+    # Threshold of raw data after reaching data will be flushed to log
+    #
+    buffer_threshold: 32768
+
+    # Set flush period in-memory queue
+    #   Type:     integer
+    #   Values:   (greater than zero) miliseconds
+    #   Default:  2000
+    #   Override: $SCOPE_LOG_FLUSH_PERIOD
+    #
+    # Period after data will be flushed to log
+    #
+    flush_period: 2000
+
     # Backend connection for logs
     #
     transport:
diff --git a/test/reporttest.c b/test/reporttest.c
index 8556f71a4..c7c1a59f3 100644
--- a/test/reporttest.c
+++ b/test/reporttest.c
@@ -19,6 +19,7 @@ event_t evtBuf[BUFSIZE] = {{0}};
 int evtBufNext = 0;
 event_t mtcBuf[BUFSIZE] = {{0}};
 int mtcBufNext = 0;
+static config_t *test_config;
 
 // These signatures satisfy --wrap=cmdSendEvent in the Makefile
 #ifdef __linux__
@@ -148,9 +149,11 @@ countTestSetup(void** state)
 
     // init objects that count has
     init_g_proc();
+    test_config = cfgCreateDefault();
+
     g_log = logCreate();
     g_mtc = mtcCreate();
-    g_ctl = ctlCreate();
+    g_ctl = ctlCreate(test_config);
 
     initState();
 
@@ -169,6 +172,7 @@ countTestTeardown(void** state)
     logDestroy(&g_log);
     mtcDestroy(&g_mtc);
     ctlDestroy(&g_ctl);
+    cfgDestroy(&test_config);
 
     // Call the general groupTeardown() too.
     return groupTeardown(state);
diff --git a/website/src/pages/docs/config-file.md b/website/src/pages/docs/config-file.md
index 04ef8ace9..19239592b 100644
--- a/website/src/pages/docs/config-file.md
+++ b/website/src/pages/docs/config-file.md
@@ -615,6 +615,26 @@ libscope:
     #
     level: warning
 
+    # Set buffer threshold of the in-memory queue
+    #   Type:     integer
+    #   Values:   (greater than zero) bytes
+    #   Default:  32768
+    #   Override: $SCOPE_LOG_BUFFER_THRESHOLD
+    #
+    # Threshold of raw data after reaching data will be flushed to log
+    #
+    buffer_threshold: 32768
+
+    # Set flush period in-memory queue
+    #   Type:     integer
+    #   Values:   (greater than zero) miliseconds
+    #   Default:  2000
+    #   Override: $SCOPE_LOG_FLUSH_PERIOD
+    #
+    # Period after data will be flushed to log
+    #
+    flush_period: 2000
+
     # Backend connection for logs
     #
     transport: