Skip to content

Commit 7166277

Browse files
committed
Feature: added vhost_traffic_status_display_jsonp to support JSONP
1 parent 8bc8925 commit 7166277

File tree

5 files changed

+39
-15
lines changed

5 files changed

+39
-15
lines changed

Changes

+16-9
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,25 @@
1-
v0.1.8 [Tue Dec 15 2015 YoungJoo.Kim <[email protected]>]
1+
v0.1.9 [Fri Feb 26 2016 YoungJoo.Kim <[email protected]>]
2+
* Feature: added vhost_traffic_status_display_jsonp
3+
to support JSONP
4+
5+
* Refactor: changed function names from ngx_vhost_*
6+
to ngx_http_vhost_*
7+
8+
v0.1.8 [Tue Dec 15 2015 YoungJoo.Kim <[email protected]>]
29
* Feature: added support for implementing the feature that
310
upstream peers use shared memory.(upstream zone directive)
411

5-
v0.1.7 [Fri Dec 11 2015 YoungJoo.Kim <vozlt@vozlt.com>]
12+
v0.1.7 [Fri Dec 11 2015 YoungJoo.Kim <vozltx@gmail.com>]
613
* Bugfix: fixed issues/28 that can't use control functionality
714
if location has more than a segment.
815

916
* Feature: added support for implementing traffic limit.
1017

11-
v0.1.6 [Tue Nov 25 2015 YoungJoo.Kim <vozlt@vozlt.com>]
18+
v0.1.6 [Tue Nov 25 2015 YoungJoo.Kim <vozltx@gmail.com>]
1219
* Feature: added support for implementing variables for
1320
current traffic status values. It is starting with a $vts_*.
1421

15-
v0.1.5 [Fri Nov 20 2015 YoungJoo.Kim <vozlt@vozlt.com>]
22+
v0.1.5 [Fri Nov 20 2015 YoungJoo.Kim <vozltx@gmail.com>]
1623
* Bugfix: fixed issues/26 that the each diffrent proxy
1724
caches are used by single zone(key).
1825

@@ -26,7 +33,7 @@ v0.1.5 [Fri Nov 20 2015 YoungJoo.Kim <[email protected]>]
2633
* Refactor: removed overlapping routine and merged into
2734
functions.
2835

29-
v0.1.4 [Mon Nov 02 2015 YoungJoo.Kim <vozlt@vozlt.com>]
36+
v0.1.4 [Mon Nov 02 2015 YoungJoo.Kim <vozltx@gmail.com>]
3037
* Feature: added vhost_traffic_status_filter
3138
to globally enable or disable the filter features.
3239

@@ -42,7 +49,7 @@ v0.1.4 [Mon Nov 02 2015 YoungJoo.Kim <[email protected]>]
4249

4350
* Feature: added update interval in HTML.
4451

45-
v0.1.3 [Wed Oct 21 2015 YoungJoo.Kim <vozlt@vozlt.com>]
52+
v0.1.3 [Wed Oct 21 2015 YoungJoo.Kim <vozltx@gmail.com>]
4653
* Bugfix: stats for cached responses with error_page
4754
directive do not create a cache file by pull/23
4855
Thanks to Wandenberg Peixoto.
@@ -52,18 +59,18 @@ v0.1.3 [Wed Oct 21 2015 YoungJoo.Kim <[email protected]>]
5259
to set the dynamically keys for issues/24.
5360
Thanks to Pauli Jokela for suggestion this work.
5461

55-
v0.1.2 [Wed Sep 23 2015 YoungJoo.Kim <vozlt@vozlt.com>]
62+
v0.1.2 [Wed Sep 23 2015 YoungJoo.Kim <vozltx@gmail.com>]
5663
* Bugfix: added cache variable's lock routine in
5764
ngx_http_vhost_traffic_status_shm_add_cache() for issues/19
5865

5966
* Compatibility: added overflow handling routines of variables.
6067
It deals with the overflow of both 32bit and 64bit variables
6168
but I think that not be useful in 64bit variable(Max:16EB) at this moment.
6269

63-
v0.1.1 [Thu May 28 2015 YoungJoo.Kim <vozlt@vozlt.com>]
70+
v0.1.1 [Thu May 28 2015 YoungJoo.Kim <vozltx@gmail.com>]
6471
* Feature: cache status support when using the proxy_cache directive.
6572

66-
v0.1.0 [Thu May 28 2015 YoungJoo.Kim <vozlt@vozlt.com>]
73+
v0.1.0 [Thu May 28 2015 YoungJoo.Kim <vozltx@gmail.com>]
6774
* The first version.
6875

6976
# vi:set ft=changelog ts=4 sw=4 et fdm=marker:

LICENSE

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (C) 2015, YoungJoo.Kim <vozlt@vozlt.com>
1+
Copyright (C) 2015, YoungJoo.Kim <vozltx@gmail.com>
22

33
All rights reserved.
44

README.md

+20-3
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ Table of Contents
4747
* [vhost_traffic_status_zone](#vhost_traffic_status_zone)
4848
* [vhost_traffic_status_display](#vhost_traffic_status_display)
4949
* [vhost_traffic_status_display_format](#vhost_traffic_status_display_format)
50+
* [vhost_traffic_status_display_jsonp](#vhost_traffic_status_display_jsonp)
5051
* [vhost_traffic_status_filter](#vhost_traffic_status_filter)
5152
* [vhost_traffic_status_filter_by_host](#vhost_traffic_status_filter_by_host)
5253
* [vhost_traffic_status_filter_by_set_key](#vhost_traffic_status_filter_by_set_key)
@@ -60,7 +61,7 @@ Table of Contents
6061
* [Author](#author)
6162

6263
## Version
63-
This document describes nginx-module-vts `v0.1.8` released on 15 Dec 2015.
64+
This document describes nginx-module-vts `v0.1.9` released on 26 Feb 2016.
6465

6566
## Dependencies
6667
* [nginx](http://nginx.org)
@@ -128,11 +129,15 @@ and then if the directive `vhost_traffic_status_display` is set, can be access t
128129

129130
* /status/format/html
130131

132+
* /status/format/jsonp
133+
131134
* /status/control
132135

133136
* If you request `/status/format/json`, will respond with a JSON document containing the current activity data for using in live dashboards and third-party monitoring tools.
134137

135138
* If you request `/status/format/html`, will respond with the built-in live dashboard in HTML that requests internally to `/status/format/json`.
139+
140+
* If you request `/status/format/jsonp`, will respond with a JSONP callback function containing the current activity data for using in live dashboards and third-party monitoring tools.
136141

137142
* If you request `/status/control`, will respond with a JSON document after it reset or delete zones through a query string. See the [Control](#control).
138143

@@ -890,13 +895,24 @@ The cache is shared between all worker processes.
890895

891896
- | -
892897
--- | ---
893-
**Syntax** | **vhost_traffic_status_display_format** \<json\|html\>
898+
**Syntax** | **vhost_traffic_status_display_format** \<json\|html\|jsonp\>
894899
**Default** | json
895900
**Context** | http, server, location
896901

897902
`Description:` Sets the display handler's output format.
898903
If you set `json`, will respond with a JSON document.
899904
If you set `html`, will respond with the built-in live dashboard in HTML.
905+
If you set `jsonp`, will respond with a JSONP callback function(default: *ngx_http_vhost_traffic_status_jsonp_callback*).
906+
907+
### vhost_traffic_status_display_jsonp
908+
909+
- | -
910+
--- | ---
911+
**Syntax** | **vhost_traffic_status_display_jsonp** *callback*
912+
**Default** | ngx_http_vhost_traffic_status_jsonp_callback
913+
**Context** | http, server, location
914+
915+
`Description:` Sets the callback name for the JSONP.
900916

901917
### vhost_traffic_status_filter
902918

@@ -1162,9 +1178,10 @@ in each directives(http, server, location) if this option is enabled.
11621178

11631179
## TODO
11641180
* Add support for implementing `stream` stats.
1181+
* Add support for implementing `request_time` stats.
11651182

11661183
## Donation
11671184
[![License](http://img.shields.io/badge/PAYPAL-DONATE-yellow.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=PWWSYKQ9VKH38&lc=KR&currency_code=USD&bn=PP%2dDonationsBF%3abtn_donateCC_LG%2egif%3aNonHosted)
11681185

11691186
## Author
1170-
YoungJoo.Kim(김영주) [<vozlt@vozlt.com>]
1187+
YoungJoo.Kim(김영주) [<vozltx@gmail.com>]

util/fileToHex.pl

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#
33
# @file: fileToHex.pl
44
# @brief:
5-
# @author: YoungJoo.Kim <vozlt@vozlt.com>
5+
# @author: YoungJoo.Kim <vozltx@gmail.com>
66
# @version:
77
# @date:
88

util/tplToDefine.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#
33
# @file: tplToDefine.sh
44
# @brief:
5-
# @author: YoungJoo.Kim <vozlt@vozlt.com>
5+
# @author: YoungJoo.Kim <vozltx@gmail.com>
66
# @version:
77
# @date:
88

0 commit comments

Comments
 (0)