X-Git-Url: https://git.saurik.com/redis.git/blobdiff_plain/45e7a1ce00380ccf5f41080d69c655e120aacad6..dfcf5a0ac8f80a15a4d1e3e581de80064663c89e:/src/redis.h diff --git a/src/redis.h b/src/redis.h index 218d72fb..c425691e 100644 --- a/src/redis.h +++ b/src/redis.h @@ -634,6 +634,11 @@ struct redisServer { int lua_timedout; /* True if we reached the time limit for script execution. */ int lua_kill; /* Kill the script if true. */ + /* Assert & bug reportign */ + char *assert_failed; + char *assert_file; + int assert_line; + int bug_report_start; /* True if bug report header already logged. */ }; typedef struct pubsubPattern { @@ -949,7 +954,7 @@ int listMatchPubsubPattern(void *a, void *b); int pubsubPublishMessage(robj *channel, robj *message); /* Configuration */ -void loadServerConfig(char *filename); +void loadServerConfig(char *filename, char *options); void appendServerSaveParams(time_t seconds, int changes); void resetServerSaveParams(); @@ -1148,5 +1153,6 @@ void *realloc(void *ptr, size_t size) __attribute__ ((deprecated)); void _redisAssertWithInfo(redisClient *c, robj *o, char *estr, char *file, int line); void _redisAssert(char *estr, char *file, int line); void _redisPanic(char *msg, char *file, int line); +void bugReportStart(void); #endif