move a thing

slact · Nov 30, 2015 · fd952a6 · fd952a6
1 parent c29dd42
commit fd952a6
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 23 deletions.
diff --git a/src/nchan_commands.rb b/src/nchan_commands.rb
@@ -136,16 +136,6 @@
       default: :off,
       info: "Use redis for message storage at this location."
 
-  nchan_message_buffer_length [:main, :srv, :loc],
-      :nchan_set_message_buffer_length,
-      :loc_conf,
-      legacy: "push_message_buffer_length",
-
-      group: "storage",
-      value: "<number>",
-      default: "none",
-      info: "The exact number of messages to store per channel. Sets both nchan_max_message_buffer_length and nchan_min_message_buffer_length to this value."
-
   nchan_message_timeout [:main, :srv, :loc], 
       :ngx_conf_set_sec_slot, 
       [:loc_conf, :buffer_timeout],
@@ -176,6 +166,16 @@
       default: 10,
       info: "The maximum number of messages to store per channel. A channel's message buffer will retain a maximum of this many most recent messages."
 
+    nchan_message_buffer_length [:main, :srv, :loc],
+      :nchan_set_message_buffer_length,
+      :loc_conf,
+      legacy: "push_message_buffer_length",
+
+      group: "storage",
+      value: "<number>",
+      default: "none",
+      info: "The exact number of messages to store per channel. Sets both nchan_max_message_buffer_length and nchan_min_message_buffer_length to this value."
+
   nchan_delete_oldest_received_message [:main, :srv, :loc],
       :ngx_conf_set_flag_slot,
       [:loc_conf, :delete_oldest_received_message],

diff --git a/src/nchan_config_commands.c b/src/nchan_config_commands.c
@@ -152,19 +152,6 @@ static ngx_command_t  nchan_commands[] = {
     offsetof(nchan_loc_conf_t, use_redis),
     NULL } ,
 
-  { ngx_string("nchan_message_buffer_length"),
-    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
-    nchan_set_message_buffer_length,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    0,
-    NULL } ,
-  { ngx_string("push_message_buffer_length"), //legacy for nchan_message_buffer_length
-    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
-    nchan_set_message_buffer_length,
-    NGX_HTTP_LOC_CONF_OFFSET,
-    0,
-    NULL } ,
-
   { ngx_string("nchan_message_timeout"),
     NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
     ngx_conf_set_sec_slot,
@@ -204,6 +191,19 @@ static ngx_command_t  nchan_commands[] = {
     offsetof(nchan_loc_conf_t, max_messages),
     NULL } ,
 
+  { ngx_string("nchan_message_buffer_length"),
+    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+    nchan_set_message_buffer_length,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    0,
+    NULL } ,
+  { ngx_string("push_message_buffer_length"), //legacy for nchan_message_buffer_length
+    NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
+    nchan_set_message_buffer_length,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    0,
+    NULL } ,
+
   { ngx_string("nchan_delete_oldest_received_message"),
     NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1,
     ngx_conf_set_flag_slot,