[skywalking-nginx-lua] branch master updated: Merge shared buffers.

[wu...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

wusheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking-nginx-lua.git


The following commit(s) were added to refs/heads/master by this push:
     new fc58a76  Merge shared buffers.
fc58a76 is described below

commit fc58a76232f7e1a4d18d75e20a4c1fe8a05efab6
Author: Wu Sheng <wu...@foxmail.com>
AuthorDate: Sun Feb 23 00:12:40 2020 +0800

    Merge shared buffers.
---
 examples/nginx.conf | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/examples/nginx.conf b/examples/nginx.conf
index 77b7eac..4368ca4 100644
--- a/examples/nginx.conf
+++ b/examples/nginx.conf
@@ -26,14 +26,13 @@ events {
 }
 http {
     lua_package_path "/Users/wusheng/Documents/GitHub/skywalking-nginx-lua/lib/skywalking/?.lua;;";
-    # Put the finished segment into this buffer as a queue
-    lua_shared_dict segment_buffer 100m;
-    lua_shared_dict metadata_buffer 1m;
+    # Buffer represents the register inform and the queue of the finished segment 
+    lua_shared_dict tracing_buffer 100m;
     
     # Init is the timer setter and keeper
     # Setup an infinite loop timer to do register and trace report.
     init_worker_by_lua_block {
-        local metadata_buffer = ngx.shared.metadata_buffer
+        local metadata_buffer = ngx.shared.tracing_buffer
         metadata_buffer['serviceName'] = 'Service Name'
 
         require("client"):startTimer(metadata_buffer, "http://127.0.0.1:8080/skywalking")
@@ -52,7 +51,7 @@ http {
                 local TC = require('tracing_context')
                 local Layer = require('span_layer')
 
-                local metadata_buffer = ngx.shared.metadata_buffer
+                local metadata_buffer = ngx.shared.tracing_buffer
                 -- Mock the service instance id
                 metadata_buffer['serviceId'] = 1
                 metadata_buffer['serviceInstId'] = 1
@@ -122,7 +121,7 @@ http {
                         local segmentJson = require('cjson').encode(segment:transform())
                         ngx.log(ngx.DEBUG, 'segment = ' .. segmentJson)
 
-                        local queue = ngx.shared.segment_buffer
+                        local queue = ngx.shared.tracing_buffer
                         local length = queue:lpush('segment', segmentJson)
                         ngx.log(ngx.DEBUG, 'segment buffer size = ' .. queue:llen('segment'))
                     end