030-pidfiles-in-same-directory.patch (1028B)
1 diff -rupN seafile-server-5.1.1.orig/controller/seafile-controller.c seafile-server-5.1.1/controller/seafile-controller.c 2 --- seafile-server-5.1.1.orig/controller/seafile-controller.c 2016-04-19 15:44:32.000000000 +0200 3 +++ seafile-server-5.1.1/controller/seafile-controller.c 2016-04-19 16:23:05.785000218 +0200 4 @@ -21,7 +21,7 @@ 5 6 SeafileController *ctl; 7 8 -static char *controller_pidfile = NULL; 9 +static char *controller_pidfile = "/var/run/seafile/seafile-controller.pid"; 10 11 char *bin_dir = NULL; 12 char *installpath = NULL; 13 @@ -575,9 +575,9 @@ stop_ccnet_server () 14 static void 15 init_pidfile_path (SeafileController *ctl) 16 { 17 - char *pid_dir = g_build_filename (topdir, "pids", NULL); 18 + char *pid_dir = g_path_get_dirname (controller_pidfile); 19 if (!g_file_test(pid_dir, G_FILE_TEST_EXISTS)) { 20 - if (g_mkdir(pid_dir, 0777) < 0) { 21 + if (g_mkdir(pid_dir, 0755) < 0) { 22 seaf_warning("failed to create pid dir %s: %s", pid_dir, strerror(errno)); 23 controller_exit(1); 24 }