haiwen/seafile-server
1
0
Fork 0
mirror of https://github.com/haiwen/seafile-server.git synced 2025-09-12 21:35:30 +00:00
Code Issues Releases Wiki Activity

Merge pull request #139 from haiwen/controller_restart_ccnet

Browse Source 
Restart ccnet if seaf-server is down.
This commit is contained in:
Jiaqiang Xu
2018-04-09 15:55:25 +08:00
committed by GitHub
parent 5a443b1bf8 122aaad60b
commit 93e900eeaa
1 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
controller/seafile-controller.c
View File

@@ -140,6 +140,21 @@ try_kill_process(int which)
}
}
static void
kill_by_force (int which)
{
if (which < 0 || which >= N_PID)
return;
char *pidfile = ctl->pidfile[which];
int pid = read_pid_from_pidfile(pidfile);
if (pid > 0) {
// if SIGKILL send success, then remove related pid file
if (kill ((pid_t)pid, SIGKILL) == 0) {
g_unlink (pidfile);
}
}
}
//
// Utility functions End
@@ -404,6 +419,7 @@ need_restart (int which)
if (g_file_test (buf, G_FILE_TEST_IS_DIR)) {
return FALSE;
} else {
seaf_warning ("path /proc/%d doesn't exist, restart progress [%d]\n", pid, which);
return TRUE;
}
}
@@ -414,7 +430,7 @@ check_process (void *data)
{
if (need_restart(PID_SERVER)) {
seaf_message ("seaf-server need restart...\n");
start_seaf_server ();
kill_by_force (PID_CCNET);
}
if (ctl->seafdav_config.enabled) {
@@ -567,9 +583,9 @@ stop_ccnet_server ()
GError *error = NULL;
ccnet_client_send_cmd (ctl->sync_client, "shutdown", &error);
try_kill_process(PID_CCNET);
try_kill_process(PID_SERVER);
try_kill_process(PID_SEAFDAV);
kill_by_force(PID_CCNET);
kill_by_force(PID_SERVER);
kill_by_force(PID_SEAFDAV);
}
static void