Skip to content

Commit

Permalink
log vbucket_get_error() on bad config
Browse files Browse the repository at this point in the history
Change-Id: I14ad783d64c1831985b2dd7e591feb801b1fb050
Reviewed-on: http://review.membase.org/3757
Tested-by: Steve Yen <steve.yen@gmail.com>
Tested-by: Chiyoung Seo <chiyoung.seo@gmail.com>
Reviewed-by: Chiyoung Seo <chiyoung.seo@gmail.com>
  • Loading branch information
steveyen authored and chiyoung committed Nov 20, 2010
1 parent 1d2c2fe commit f114b8d
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions agent_config.c
Expand Up @@ -650,9 +650,11 @@ bool cproxy_on_config_json_one_vbucket(proxy_main *m, uint32_t new_config_ver,

vbucket_config_destroy(vch);
} else {
moxi_log_write("ERROR: bad JSON configuration: %s\n", config);
moxi_log_write("ERROR: bad JSON configuration: %s (%s)\n",
vbucket_get_error(), config);
if (ml->log_mode != ERRORLOG_STDERR) {
fprintf(stderr, "ERROR: bad JSON configuration: %s\n", config);
fprintf(stderr, "ERROR: bad JSON configuration: %s (%s)\n",
vbucket_get_error(), config);
}

// Bug 1961 - don't exit() as we might be in a multitenant use case.
Expand Down

0 comments on commit f114b8d

Please sign in to comment.