[Groonga-commit] groonga/groonga [master] httpd: shutdown on database open error

Back to archive index

null+****@clear***** null+****@clear*****
2012年 7月 25日 (水) 15:10:45 JST


Kouhei Sutou	2012-07-25 15:10:45 +0900 (Wed, 25 Jul 2012)

  New Revision: 9e2d6bf445a7732ec40a4ffee0b7c37a5916b2cf
  https://github.com/groonga/groonga/commit/9e2d6bf445a7732ec40a4ffee0b7c37a5916b2cf

  Log:
    httpd: shutdown on database open error

  Modified files:
    src/nginx-module/ngx_http_groonga_module.c

  Modified: src/nginx-module/ngx_http_groonga_module.c (+6 -1)
===================================================================
--- src/nginx-module/ngx_http_groonga_module.c    2012-07-25 13:56:23 +0900 (e267276)
+++ src/nginx-module/ngx_http_groonga_module.c    2012-07-25 15:10:45 +0900 (b540448)
@@ -419,7 +419,12 @@ ngx_http_groonga_open_database_callback(ngx_http_groonga_loc_conf_t *location_co
   }
 
   grn_db_open(context, location_conf->database_path_cstr);
-  data->rc = ngx_http_groonga_context_check(data->log, context);
+  if (context->rc != GRN_SUCCESS) {
+    ngx_log_error(NGX_LOG_EMERG, data->log, 0,
+                  "failed to open groonga database: %s",
+                  context->errbuf);
+    data->rc = NGX_ERROR;
+  }
 }
 
 static void
-------------- next part --------------
HTML$B$NE:IU%U%!%$%k$rJ]4I$7$^$7$?(B...
下载 



Groonga-commit メーリングリストの案内
Back to archive index