Fossil SCM
Cause all SQLite errors to be logged as warnings.
Commit
99fea6cde4ac1058d519d277ce6c7a91edde84f9
Parent
e95e87c1edf4b1e…
1 file changed
+6
+6
| --- src/main.c | ||
| +++ src/main.c | ||
| @@ -226,10 +226,11 @@ | ||
| 226 | 226 | int main(int argc, char **argv){ |
| 227 | 227 | const char *zCmdName; |
| 228 | 228 | int idx; |
| 229 | 229 | int rc; |
| 230 | 230 | |
| 231 | + sqlite3_config(SQLITE_CONFIG_LOG, fossil_sqlite_log, 0); | |
| 231 | 232 | g.now = time(0); |
| 232 | 233 | g.argc = argc; |
| 233 | 234 | g.argv = argv; |
| 234 | 235 | if( getenv("GATEWAY_INTERFACE")!=0 ){ |
| 235 | 236 | zCmdName = "cgi"; |
| @@ -347,10 +348,15 @@ | ||
| 347 | 348 | cgi_printf("<p><font color=\"red\">%h</font></p>", z); |
| 348 | 349 | }else{ |
| 349 | 350 | fprintf(stderr, "%s: %s\n", g.argv[0], z); |
| 350 | 351 | } |
| 351 | 352 | } |
| 353 | + | |
| 354 | +/* Error logs from SQLite */ | |
| 355 | +void fossil_sqlite_log(void *notUsed, int iCode, const char *zErrmsg){ | |
| 356 | + fossil_warning("SQLite error log (code %d): %s", iCode, zErrmsg); | |
| 357 | +} | |
| 352 | 358 | |
| 353 | 359 | /* |
| 354 | 360 | ** Print a usage comment and quit |
| 355 | 361 | */ |
| 356 | 362 | void usage(const char *zFormat){ |
| 357 | 363 |
| --- src/main.c | |
| +++ src/main.c | |
| @@ -226,10 +226,11 @@ | |
| 226 | int main(int argc, char **argv){ |
| 227 | const char *zCmdName; |
| 228 | int idx; |
| 229 | int rc; |
| 230 | |
| 231 | g.now = time(0); |
| 232 | g.argc = argc; |
| 233 | g.argv = argv; |
| 234 | if( getenv("GATEWAY_INTERFACE")!=0 ){ |
| 235 | zCmdName = "cgi"; |
| @@ -347,10 +348,15 @@ | |
| 347 | cgi_printf("<p><font color=\"red\">%h</font></p>", z); |
| 348 | }else{ |
| 349 | fprintf(stderr, "%s: %s\n", g.argv[0], z); |
| 350 | } |
| 351 | } |
| 352 | |
| 353 | /* |
| 354 | ** Print a usage comment and quit |
| 355 | */ |
| 356 | void usage(const char *zFormat){ |
| 357 |
| --- src/main.c | |
| +++ src/main.c | |
| @@ -226,10 +226,11 @@ | |
| 226 | int main(int argc, char **argv){ |
| 227 | const char *zCmdName; |
| 228 | int idx; |
| 229 | int rc; |
| 230 | |
| 231 | sqlite3_config(SQLITE_CONFIG_LOG, fossil_sqlite_log, 0); |
| 232 | g.now = time(0); |
| 233 | g.argc = argc; |
| 234 | g.argv = argv; |
| 235 | if( getenv("GATEWAY_INTERFACE")!=0 ){ |
| 236 | zCmdName = "cgi"; |
| @@ -347,10 +348,15 @@ | |
| 348 | cgi_printf("<p><font color=\"red\">%h</font></p>", z); |
| 349 | }else{ |
| 350 | fprintf(stderr, "%s: %s\n", g.argv[0], z); |
| 351 | } |
| 352 | } |
| 353 | |
| 354 | /* Error logs from SQLite */ |
| 355 | void fossil_sqlite_log(void *notUsed, int iCode, const char *zErrmsg){ |
| 356 | fossil_warning("SQLite error log (code %d): %s", iCode, zErrmsg); |
| 357 | } |
| 358 | |
| 359 | /* |
| 360 | ** Print a usage comment and quit |
| 361 | */ |
| 362 | void usage(const char *zFormat){ |
| 363 |