diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2015-06-09 13:37:08 -0400 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2015-06-09 13:37:08 -0400 |
| commit | cac1d093ecba3cb5124e43a082d21a4a4fd3aafe (patch) | |
| tree | f0e5ae783d3db956010f5436824840ce931a44d8 /src | |
| parent | e06e56212c95e5187d930ac4a98131a88cb934ed (diff) | |
Report more information if pg_perm_setlocale() fails at startup.
We don't know why a few Windows users have seen this fail, but the
taciturnity of the error message certainly isn't helping debug it.
Let's at least find out which LC category isn't working.
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/main/main.c | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/src/backend/main/main.c b/src/backend/main/main.c index e2bdee890c8..b764f552f83 100644 --- a/src/backend/main/main.c +++ b/src/backend/main/main.c @@ -51,7 +51,7 @@ const char *progname; static void startup_hacks(const char *progname); -static void init_locale(int category, const char *locale); +static void init_locale(const char *categoryname, int category, const char *locale); static void help(const char *progname); static void check_root(const char *progname); static char *get_current_username(const char *progname); @@ -123,31 +123,31 @@ main(int argc, char *argv[]) char *env_locale; if ((env_locale = getenv("LC_COLLATE")) != NULL) - init_locale(LC_COLLATE, env_locale); + init_locale("LC_COLLATE", LC_COLLATE, env_locale); else - init_locale(LC_COLLATE, ""); + init_locale("LC_COLLATE", LC_COLLATE, ""); if ((env_locale = getenv("LC_CTYPE")) != NULL) - init_locale(LC_CTYPE, env_locale); + init_locale("LC_CTYPE", LC_CTYPE, env_locale); else - init_locale(LC_CTYPE, ""); + init_locale("LC_CTYPE", LC_CTYPE, ""); } #else - init_locale(LC_COLLATE, ""); - init_locale(LC_CTYPE, ""); + init_locale("LC_COLLATE", LC_COLLATE, ""); + init_locale("LC_CTYPE", LC_CTYPE, ""); #endif #ifdef LC_MESSAGES - init_locale(LC_MESSAGES, ""); + init_locale("LC_MESSAGES", LC_MESSAGES, ""); #endif /* * We keep these set to "C" always, except transiently in pg_locale.c; see * that file for explanations. */ - init_locale(LC_MONETARY, "C"); - init_locale(LC_NUMERIC, "C"); - init_locale(LC_TIME, "C"); + init_locale("LC_MONETARY", LC_MONETARY, "C"); + init_locale("LC_NUMERIC", LC_NUMERIC, "C"); + init_locale("LC_TIME", LC_TIME, "C"); /* * Now that we have absorbed as much as we wish to from the locale @@ -287,11 +287,12 @@ startup_hacks(const char *progname) * category's environment variable. */ static void -init_locale(int category, const char *locale) +init_locale(const char *categoryname, int category, const char *locale) { if (pg_perm_setlocale(category, locale) == NULL && pg_perm_setlocale(category, "C") == NULL) - elog(FATAL, "could not adopt C locale"); + elog(FATAL, "could not adopt \"%s\" locale nor C locale for %s", + locale, categoryname); } |