-
Notifications
You must be signed in to change notification settings - Fork 34
/
lua_module_v0_10_12.patch
439 lines (399 loc) · 12.5 KB
/
lua_module_v0_10_12.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
From 9a1e0a0ec78c8281e1ccd006554b1c3dca2742a8 Mon Sep 17 00:00:00 2001
From: Mikhail Kirichenko <m.kirichenko@corp.mail.ru>
Date: Mon, 19 Apr 2021 20:21:23 +0300
Subject: [PATCH 1/3] initial patch
---
config | 2 +
src/ngx_http_lua_graphite.c | 117 ++++++++++++++++++++++++++++++++++++
src/ngx_http_lua_graphite.h | 11 ++++
src/ngx_http_lua_util.c | 13 +++-
4 files changed, 142 insertions(+), 1 deletion(-)
create mode 100644 src/ngx_http_lua_graphite.c
create mode 100644 src/ngx_http_lua_graphite.h
diff --git a/config b/config
index 044deb97..46d8f23b 100644
--- a/config
+++ b/config
@@ -360,6 +360,7 @@ HTTP_LUA_SRCS=" \
$ngx_addon_dir/src/ngx_http_lua_ssl_session_storeby.c \
$ngx_addon_dir/src/ngx_http_lua_ssl_session_fetchby.c \
$ngx_addon_dir/src/ngx_http_lua_ssl.c \
+ $ngx_addon_dir/src/ngx_http_lua_graphite.c \
$ngx_addon_dir/src/ngx_http_lua_log_ringbuf.c \
"
@@ -421,6 +422,7 @@ HTTP_LUA_DEPS=" \
$ngx_addon_dir/src/ngx_http_lua_ssl_session_storeby.h \
$ngx_addon_dir/src/ngx_http_lua_ssl_session_fetchby.h \
$ngx_addon_dir/src/ngx_http_lua_ssl.h \
+ $ngx_addon_dir/src/ngx_http_lua_graphite.h \
$ngx_addon_dir/src/ngx_http_lua_log_ringbuf.h \
"
diff --git a/src/ngx_http_lua_graphite.c b/src/ngx_http_lua_graphite.c
new file mode 100644
index 00000000..9178553d
--- /dev/null
+++ b/src/ngx_http_lua_graphite.c
@@ -0,0 +1,117 @@
+#ifndef DDEBUG
+#define DDEBUG 0
+#endif
+#include "ddebug.h"
+
+
+#include "ngx_http_graphite_module.h"
+#include "ngx_http_lua_graphite.h"
+#include "ngx_http_lua_util.h"
+
+
+static int ngx_http_lua_graphite(lua_State *L);
+static int ngx_http_lua_graphite_get(lua_State *L);
+static int ngx_http_lua_graphite_set(lua_State *L);
+
+
+void
+ngx_http_lua_inject_graphite_api(lua_State *L)
+{
+ lua_createtable(L, 0, 2);
+ lua_newtable(L);
+ lua_pushcfunction(L, ngx_http_lua_graphite);
+ lua_setfield(L, -2, "__call");
+ lua_setmetatable(L, -2);
+
+ lua_pushcfunction(L, ngx_http_lua_graphite_get);
+ lua_setfield(L, -2, "get");
+
+ lua_pushcfunction(L, ngx_http_lua_graphite_set);
+ lua_setfield(L, -2, "set");
+
+ lua_setfield(L, -2, "graphite");
+}
+
+
+static int
+ngx_http_lua_graphite(lua_State *L) {
+
+ size_t n = lua_gettop(L) - 1;
+ if (n != 2 && n != 3) {
+ return luaL_error(L, "ngx.graphite expecting 2 or 3 arguments got %d", n);
+ }
+
+ ngx_http_request_t *r;
+ r = ngx_http_lua_get_req(L);
+
+ if (r == NULL) {
+ return luaL_error(L, "no request object found");
+ }
+
+ ngx_str_t name;
+ name.data = (u_char*)lua_tolstring(L, 2, &name.len);
+ if (name.data == NULL)
+ return 0;
+
+ double value = lua_tonumber(L, 3);
+
+ ngx_http_graphite(r, &name, value);
+
+ return 0;
+}
+
+
+static int
+ngx_http_lua_graphite_get(lua_State *L) {
+
+ size_t n = lua_gettop(L);
+ if (n != 1) {
+ return luaL_error(L, "ngx.graphite.get expecting 1 argument got %d", n);
+ }
+
+ ngx_http_request_t *r;
+ r = ngx_http_lua_get_req(L);
+
+ if (r == NULL) {
+ return luaL_error(L, "no request object found");
+ }
+
+ ngx_str_t name;
+ name.data = (u_char*)lua_tolstring(L, 1, &name.len);
+ if (name.data == NULL)
+ return 0;
+
+ double value = ngx_http_graphite_get(r, &name);
+
+ lua_pushnumber(L, value);
+
+ return 1;
+}
+
+
+static int
+ngx_http_lua_graphite_set(lua_State *L) {
+
+ size_t n = lua_gettop(L);
+ if (n != 2) {
+ return luaL_error(L, "ngx.graphite.get expecting 2 arguments got %d", n);
+ }
+
+ ngx_http_request_t *r;
+ r = ngx_http_lua_get_req(L);
+
+ if (r == NULL) {
+ return luaL_error(L, "no request object found");
+ }
+
+ ngx_str_t name;
+ name.data = (u_char*)lua_tolstring(L, 1, &name.len);
+ if (name.data == NULL)
+ return 0;
+
+ double value = lua_tonumber(L, 2);
+
+ ngx_http_graphite_set(r, &name, value);
+
+ return 0;
+}
diff --git a/src/ngx_http_lua_graphite.h b/src/ngx_http_lua_graphite.h
new file mode 100644
index 00000000..cf76efa3
--- /dev/null
+++ b/src/ngx_http_lua_graphite.h
@@ -0,0 +1,11 @@
+#ifndef NGX_HTTP_LUA_GRAPHITE_H
+#define NGX_HTTP_LUA_GRAPHITE_H
+
+#include "ngx_http_lua_common.h"
+
+
+void ngx_http_lua_inject_graphite_api(lua_State *L);
+
+
+#endif /* NGX_HTTP_LUA_GRAPHITE_H */
+
diff --git a/src/ngx_http_lua_util.c b/src/ngx_http_lua_util.c
index f7a537ee..6292d8b5 100644
--- a/src/ngx_http_lua_util.c
+++ b/src/ngx_http_lua_util.c
@@ -53,6 +53,7 @@
#include "ngx_http_lua_ssl.h"
#include "ngx_http_lua_log_ringbuf.h"
+#include "ngx_http_lua_graphite.h"
#if 1
#undef ngx_http_lua_probe_info
@@ -710,7 +711,7 @@ static void
ngx_http_lua_inject_ngx_api(lua_State *L, ngx_http_lua_main_conf_t *lmcf,
ngx_log_t *log)
{
- lua_createtable(L, 0 /* narr */, 117 /* nrec */); /* ngx.* */
+ lua_createtable(L, 0 /* narr */, 118 /* nrec */); /* ngx.* */
lua_pushcfunction(L, ngx_http_lua_get_raw_phase_context);
lua_setfield(L, -2, "_phase_ctx");
@@ -744,6 +745,7 @@ ngx_http_lua_inject_ngx_api(lua_State *L, ngx_http_lua_main_conf_t *lmcf,
ngx_http_lua_inject_timer_api(L);
ngx_http_lua_inject_config_api(L);
ngx_http_lua_inject_worker_api(L);
+ ngx_http_lua_inject_graphite_api(L);
ngx_http_lua_inject_misc_api(L);
@@ -1007,7 +1009,16 @@ ngx_http_lua_run_thread(lua_State *L, ngx_http_request_t *r,
ngx_http_lua_assert(orig_coctx->co_top + nrets
== lua_gettop(orig_coctx->co));
+#ifdef NGX_GRAPHITE_PATCH
+ struct timeval start_tp;
+ ngx_gettimeofday(&start_tp);
+#endif
rv = lua_resume(orig_coctx->co, nrets);
+#ifdef NGX_GRAPHITE_PATCH
+ struct timeval stop_tp;
+ ngx_gettimeofday(&stop_tp);
+ r->lua_time += (stop_tp.tv_sec - start_tp.tv_sec) * 1000 + (stop_tp.tv_usec - start_tp.tv_usec) / 1000.0;
+#endif
#if (NGX_PCRE)
/* XXX: work-around to nginx regex subsystem */
--
2.25.1
From 49a877588691ea7136a7472ab95df2665d546c64 Mon Sep 17 00:00:00 2001
From: Alexander Drozdov <aleksandr.drozdov@corp.mail.ru>
Date: Mon, 19 Apr 2021 20:09:05 +0300
Subject: [PATCH 2/3] add ngx.graphite.param feature
Add ngx.graphite.param() function that returns an object by graphite
parameter name. We name it 'parameter link'. The link then
can be passed to ngx.graphite(), ngx.graphite.get() &
ngx.graphite.set() in place of the name.
---
src/ngx_http_lua_graphite.c | 90 +++++++++++++++++++++++++++++--------
1 file changed, 72 insertions(+), 18 deletions(-)
diff --git a/src/ngx_http_lua_graphite.c b/src/ngx_http_lua_graphite.c
index 9178553d..142c6e9f 100644
--- a/src/ngx_http_lua_graphite.c
+++ b/src/ngx_http_lua_graphite.c
@@ -10,6 +10,7 @@
static int ngx_http_lua_graphite(lua_State *L);
+static int ngx_http_lua_graphite_param(lua_State *L);
static int ngx_http_lua_graphite_get(lua_State *L);
static int ngx_http_lua_graphite_set(lua_State *L);
@@ -23,6 +24,9 @@ ngx_http_lua_inject_graphite_api(lua_State *L)
lua_setfield(L, -2, "__call");
lua_setmetatable(L, -2);
+ lua_pushcfunction(L, ngx_http_lua_graphite_param);
+ lua_setfield(L, -2, "param");
+
lua_pushcfunction(L, ngx_http_lua_graphite_get);
lua_setfield(L, -2, "get");
@@ -48,18 +52,50 @@ ngx_http_lua_graphite(lua_State *L) {
return luaL_error(L, "no request object found");
}
- ngx_str_t name;
- name.data = (u_char*)lua_tolstring(L, 2, &name.len);
- if (name.data == NULL)
- return 0;
+ int type = lua_type(L, 2);
+ if (type == LUA_TLIGHTUSERDATA) {
+ const ngx_http_graphite_link_t *link = lua_touserdata(L, 2);
- double value = lua_tonumber(L, 3);
-
- ngx_http_graphite(r, &name, value);
+ ngx_http_graphite_by_link(r, link, lua_tonumber(L, 3));
+ }
+ else if (type == LUA_TBOOLEAN)
+ return 0;
+ else {
+ ngx_str_t name;
+ name.data = (u_char*)lua_tolstring(L, 2, &name.len);
+ if (name.data == NULL)
+ return 0;
+ ngx_http_graphite(r, &name, lua_tonumber(L, 3));
+ }
return 0;
}
+static int
+ngx_http_lua_graphite_param(lua_State *L) {
+
+ int n = lua_gettop(L);
+ if (n != 1) {
+ return luaL_error(L, "ngx.graphite.param expecting 1 argument got %d", n);
+ }
+
+ ngx_http_request_t *r;
+ r = ngx_http_lua_get_req(L);
+
+ if (r == NULL) {
+ return luaL_error(L, "no request object found");
+ }
+ ngx_str_t name;
+ const ngx_http_graphite_link_t *link;
+ name.data = (u_char*)lua_tolstring(L, 1, &name.len);
+ if (name.data == NULL || (link = ngx_http_graphite_link(r, &name)) == NULL) {
+ lua_pushboolean(L, 0);
+ return 1;
+ }
+
+ lua_pushlightuserdata(L, (void *)link);
+ return 1;
+}
static int
ngx_http_lua_graphite_get(lua_State *L) {
@@ -76,12 +112,22 @@ ngx_http_lua_graphite_get(lua_State *L) {
return luaL_error(L, "no request object found");
}
- ngx_str_t name;
- name.data = (u_char*)lua_tolstring(L, 1, &name.len);
- if (name.data == NULL)
- return 0;
+ double value;
+ int type = lua_type(L, 1);
+ if (type == LUA_TLIGHTUSERDATA) {
+ const ngx_http_graphite_link_t *link = lua_touserdata(L, 1);
- double value = ngx_http_graphite_get(r, &name);
+ value = ngx_http_graphite_get_by_link(r, link);
+ }
+ else if (type == LUA_TBOOLEAN)
+ return 0;
+ else {
+ ngx_str_t name;
+ name.data = (u_char*)lua_tolstring(L, 1, &name.len);
+ if (name.data == NULL)
+ return 0;
+ value = ngx_http_graphite_get(r, &name);
+ }
lua_pushnumber(L, value);
@@ -104,14 +150,22 @@ ngx_http_lua_graphite_set(lua_State *L) {
return luaL_error(L, "no request object found");
}
- ngx_str_t name;
- name.data = (u_char*)lua_tolstring(L, 1, &name.len);
- if (name.data == NULL)
- return 0;
-
double value = lua_tonumber(L, 2);
+ int type = lua_type(L, 1);
+ if (type == LUA_TLIGHTUSERDATA) {
+ const ngx_http_graphite_link_t *link = lua_touserdata(L, 1);
+ ngx_http_graphite_set_by_link(r, link, value);
+ }
+ else if (type == LUA_TBOOLEAN)
+ return 0;
+ else {
+ ngx_str_t name;
+ name.data = (u_char*)lua_tolstring(L, 1, &name.len);
+ if (name.data == NULL)
+ return 0;
- ngx_http_graphite_set(r, &name, value);
+ ngx_http_graphite_set(r, &name, value);
+ }
return 0;
}
--
2.25.1
From c40cf28bbf35da8c18668f5b8f165aa89a6202dc Mon Sep 17 00:00:00 2001
From: Alexander Drozdov <aleksandr.drozdov@corp.mail.ru>
Date: Sat, 19 Jun 2021 12:39:39 +0300
Subject: [PATCH 3/3] add new graphite parameters on-the-fly
---
src/ngx_http_lua_graphite.c | 19 +++++++++++++++----
1 file changed, 15 insertions(+), 4 deletions(-)
diff --git a/src/ngx_http_lua_graphite.c b/src/ngx_http_lua_graphite.c
index 142c6e9f..9c660ad1 100644
--- a/src/ngx_http_lua_graphite.c
+++ b/src/ngx_http_lua_graphite.c
@@ -62,10 +62,16 @@ ngx_http_lua_graphite(lua_State *L) {
return 0;
else {
ngx_str_t name;
+ ngx_str_t config, *pconfig = NULL;
+
name.data = (u_char*)lua_tolstring(L, 2, &name.len);
if (name.data == NULL)
return 0;
- ngx_http_graphite(r, &name, lua_tonumber(L, 3));
+ if (n >= 3) {
+ config.data = (u_char*)lua_tolstring(L, 4, &config.len);
+ pconfig = &config;
+ }
+ ngx_http_graphite(r, &name, lua_tonumber(L, 3), pconfig);
}
return 0;
@@ -75,8 +81,8 @@ static int
ngx_http_lua_graphite_param(lua_State *L) {
int n = lua_gettop(L);
- if (n != 1) {
- return luaL_error(L, "ngx.graphite.param expecting 1 argument got %d", n);
+ if (n != 1 && n != 2) {
+ return luaL_error(L, "ngx.graphite.param expecting 1 or 2 arguments, got %d", n);
}
ngx_http_request_t *r;
@@ -86,9 +92,14 @@ ngx_http_lua_graphite_param(lua_State *L) {
return luaL_error(L, "no request object found");
}
ngx_str_t name;
+ ngx_str_t config, *pconfig = NULL;
const ngx_http_graphite_link_t *link;
name.data = (u_char*)lua_tolstring(L, 1, &name.len);
- if (name.data == NULL || (link = ngx_http_graphite_link(r, &name)) == NULL) {
+ if (n >= 2) {
+ config.data = (u_char*)lua_tolstring(L, 2, &config.len);
+ pconfig = &config;
+ }
+ if (name.data == NULL || (link = ngx_http_graphite_link(r, &name, pconfig)) == NULL) {
lua_pushboolean(L, 0);
return 1;
}
--
2.25.1