2ea5a2e38a
Previously, the behaviour was to unlink any control socket sat where we wanted to open ours. This would make us lose control of running servers if we happened to collide accidentally. With this patch, the new process will abort() if there is a control socket squatting on the path we want, and unlink it when it closes. This means that an unclean shutdown will leave a dangling, unattached control socket which will block a restart, but that's a better option than intentionally cutting off running servers.
68 lines
1.0 KiB
C
68 lines
1.0 KiB
C
#include <stdarg.h>
|
|
#include <stdio.h>
|
|
#include <pthread.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <errno.h>
|
|
#include <malloc.h>
|
|
#include <unistd.h>
|
|
|
|
#include "util.h"
|
|
|
|
pthread_key_t cleanup_handler_key;
|
|
|
|
int log_level = 2;
|
|
|
|
void error_init(void)
|
|
{
|
|
pthread_key_create(&cleanup_handler_key, free);
|
|
}
|
|
|
|
void error_handler(int fatal)
|
|
{
|
|
DECLARE_ERROR_CONTEXT(context);
|
|
|
|
if (context) {
|
|
longjmp(context->jmp, fatal ? 1 : 2 );
|
|
}
|
|
else {
|
|
if ( fatal ) { abort(); }
|
|
else { pthread_exit((void*) 1); }
|
|
}
|
|
}
|
|
|
|
|
|
void exit_err( const char *msg )
|
|
{
|
|
fprintf( stderr, "%s\n", msg );
|
|
exit( 1 );
|
|
}
|
|
|
|
|
|
void mylog(int line_level, const char* format, ...)
|
|
{
|
|
if (line_level < log_level) { return; }
|
|
|
|
va_list argptr;
|
|
|
|
va_start(argptr, format);
|
|
vfprintf(stderr, format, argptr);
|
|
va_end(argptr);
|
|
}
|
|
|
|
|
|
void* xrealloc(void* ptr, size_t size)
|
|
{
|
|
void* p = realloc(ptr, size);
|
|
FATAL_IF_NULL(p, "couldn't xrealloc %d bytes", ptr ? "realloc" : "malloc", size);
|
|
return p;
|
|
}
|
|
|
|
void* xmalloc(size_t size)
|
|
{
|
|
void* p = xrealloc(NULL, size);
|
|
memset(p, 0, size);
|
|
return p;
|
|
}
|
|
|