haiwen/seafile-server
1
0
Fork 0
mirror of https://github.com/haiwen/seafile-server.git synced 2025-09-25 14:42:52 +00:00
Code Issues Releases Wiki Activity

fixed run seafdav

Browse Source
This commit is contained in:
Xiangyue Cai
2019-12-20 10:24:52 +08:00
parent cf4e65b01f
commit 7c18b19eae
2 changed files with 6 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
controller/seafile-controller.c
View File

@@ -373,7 +373,9 @@ start_seafdav() {
char *argv[] = { char *argv[] = {
(char *)get_python_executable(), (char *)get_python_executable(),
"-m", "wsgidav.server.run_server", "-m", "wsgidav.server.server_cli",
"--server", "gunicorn",
"--root", "/",
"--log-file", seafdav_log_file, "--log-file", seafdav_log_file,
"--pid", ctl->pidfile[PID_SEAFDAV], "--pid", ctl->pidfile[PID_SEAFDAV],
"--port", port, "--port", port,
@@ -381,25 +383,7 @@ start_seafdav() {
NULL NULL
}; };
char *argv_fastcgi[] = { int pid = spawn_process (argv);
(char *)get_python_executable(),
"-m", "wsgidav.server.run_server",
"runfcgi",
"--log-file", seafdav_log_file,
"--pid", ctl->pidfile[PID_SEAFDAV],
"--port", port,
"--host", conf.host,
NULL
};
char **args;
if (ctl->seafdav_config.fastcgi) {
args = argv_fastcgi;
} else {
args = argv;
}
int pid = spawn_process (args);
if (pid <= 0) { if (pid <= 0) {
seaf_warning ("Failed to spawn seafdav\n"); seaf_warning ("Failed to spawn seafdav\n");
@@ -746,21 +730,11 @@ read_seafdav_config()
goto out; goto out;
} }
/* fastcgi */
ctl->seafdav_config.fastcgi = g_key_file_get_boolean(key_file, "WEBDAV", "fastcgi", &error);
if (error != NULL) {
if (error->code != G_KEY_FILE_ERROR_KEY_NOT_FOUND) {
seaf_message ("Error when reading WEBDAV.fastcgi, use default value 'false'\n");
}
ctl->seafdav_config.fastcgi = FALSE;
g_clear_error (&error);
}
/* host */ /* host */
char *host = seaf_key_file_get_string (key_file, "WEBDAV", "host", &error); char *host = seaf_key_file_get_string (key_file, "WEBDAV", "host", &error);
if (error != NULL) { if (error != NULL) {
g_clear_error(&error); g_clear_error(&error);
ctl->seafdav_config.host = g_strdup(ctl->seafdav_config.fastcgi ? "localhost" : "0.0.0.0"); ctl->seafdav_config.host = g_strdup("0.0.0.0");
} else { } else {
ctl->seafdav_config.host = host; ctl->seafdav_config.host = host;
} }

1
controller/seafile-controller.h
View File

@@ -32,7 +32,6 @@ enum {
typedef struct SeafDavConfig { typedef struct SeafDavConfig {
gboolean enabled; gboolean enabled;
gboolean fastcgi;
int port; int port;
char *host; char *host;