Skip to content

Support other conf server #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xiaokai-wang merged 9 commits into from
Dec 30, 2015
Merged

Support other conf server #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
9135949
keep consistent module-name with main-file-name and respect nginx pro…
xiaokai-wang Dec 25, 2015
011ada0
update the readme
xiaokai-wang Dec 25, 2015
ef1869a
correct code style and update readme
xiaokai-wang Dec 26, 2015
65fca92
refactor to easily support other conf server except consul
xiaokai-wang Dec 26, 2015
f424fc5
adjusting variable name and update readme
xiaokai-wang Dec 28, 2015
321c3f3
not dump upstream conf, turn to dump backend server list to local fil…
xiaokai-wang Dec 29, 2015
dae2861
complement test case
xiaokai-wang Dec 30, 2015
fdd6a1e
update readme, upsync_conf_path->upsync_dump_path
xiaokai-wang Dec 30, 2015
841d657
roll back readme, merge conflict with master
xiaokai-wang Dec 30, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Name
====

nginx-upsync-module - Nginx C module, nginx + consul server discovery service, dynamicly update upstream backend servers, dynamicly adjust backend servers weight, needn't reload nginx.
nginx-upsync-module - Nginx C module, nginx + consul server discovery service, dynamically update upstream backend servers, dynamically adjust backend servers' weight, needn't reload nginx.

Table of Contents
=================
Expand Down Expand Up @@ -71,7 +71,7 @@ http {
Description
======

This module provides a method to discover backend servers. Supporting dynamicly adding or deleting backend server through consul and dynamicly adjusting backend servers weight, module will timely pull new backend server list from consul to update nginx ip router. Nginx needn't reload. Having some advantages than others:
This module provides a method to discover backend servers. Supporting dynamically adding or deleting backend server through consul and dynamically adjusting backend servers weight, module will timely pull new backend server list from consul to update nginx ip router. Nginx needn't reload. Having some advantages than others:

* timely

Expand All @@ -89,7 +89,7 @@ This module provides a method to discover backend servers. Supporting dynamicly

nginx-upsync-module support adding or deleting servers health check, needing nginx_upstream_check_module. Recommending nginx-upsync-module + nginx_upstream_check_module.

Diretives
Directives
======

consul
Expand Down Expand Up @@ -211,7 +211,7 @@ Compatible with Nginx-1.9.x.
Installation
============

This module can be used independently, can be download[Github](https://github.com/weibocom/nginx-upsync-module.git).
This module can be used independently, and can be downloaded from [Github](https://github.com/weibocom/nginx-upsync-module.git).

Grab the nginx source code from [nginx.org](http://nginx.org/), for example, the version 1.8.0 (see nginx compatibility), and then build the source with this module:

Expand Down
10 changes: 5 additions & 5 deletions config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
have=NGX_HTTP_DYNAMIC_UPDATE_UPSTREAM . auto/have
ngx_addon_name=ngx_http_dynamic_update_upstream_module
HTTP_MODULES="$HTTP_MODULES ngx_http_dynamic_update_upstream_module"
NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/src/ngx_http_dynamic_update_upstream_module.c $ngx_addon_dir/src/ngx_http_json.c $ngx_addon_dir/src/ngx_http_parser.c"
NGX_ADDON_DEPS="$NGX_ADDON_DEPS $ngx_addon_dir/src/ngx_http_json.h $ngx_addon_dir/src/ngx_http_parser.h"
have=NGX_HTTP_UPSYNC . auto/have
ngx_addon_name=ngx_http_upsync_module
HTTP_MODULES="$HTTP_MODULES ngx_http_upsync_module"
NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/src/ngx_http_upsync_module.c $ngx_addon_dir/src/ngx_http_json.c $ngx_addon_dir/src/ngx_http_parser.c"
NGX_ADDON_DEPS="$NGX_ADDON_DEPS $ngx_addon_dir/src/ngx_http_upsync_module.h $ngx_addon_dir/src/ngx_http_json.h $ngx_addon_dir/src/ngx_http_parser.h"
ngx_feature_libs="-lm"
CORE_LIBS="$CORE_LIBS $ngx_feature_libs"
Loading
⚡