haiwen/seafile-server
1
0
Fork 0
mirror of https://github.com/haiwen/seafile-server.git synced 2025-09-04 08:54:39 +00:00
Code Issues Releases Wiki Activity

use c fileserver when sqlite3 (#509)

Browse Source
This commit is contained in:
Xiangyue Cai
2021-11-06 10:39:23 +08:00
committed by GitHub
parent 086327d369
commit 25fa59d06a
3 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ci/run.py
View File

@@ -216,6 +216,9 @@ def main():
def start_and_test_with_db(db): def start_and_test_with_db(db):
if db == 'sqlite3':
fileservers = ('c_fileserver')
else:
fileservers = ('go_fileserver', 'c_fileserver') fileservers = ('go_fileserver', 'c_fileserver')
for fileserver in fileservers: for fileserver in fileservers:
shell('rm -rf {}/*'.format(INSTALLDIR)) shell('rm -rf {}/*'.format(INSTALLDIR))

11
controller/seafile-controller.c
View File

@@ -488,6 +488,17 @@ should_start_go_fileserver()
ret = FALSE; ret = FALSE;
} }
} }
if (ret) {
char *type = NULL;
type = g_key_file_get_string (key_file, "database", "type", NULL);
if (!type || g_strcmp0 (type, "mysql") != 0) {
seaf_message ("Use C fileserver because go fileserver does not support sqlite.");
ret = FALSE;
}
g_free (type);
}
out: out:
g_key_file_free (key_file); g_key_file_free (key_file);
g_free (seafile_conf); g_free (seafile_conf);

8
server/seafile-session.c
View File

@@ -114,6 +114,14 @@ seafile_session_new(const char *central_config_dir,
session->go_fileserver = g_key_file_get_boolean (config, session->go_fileserver = g_key_file_get_boolean (config,
"fileserver", "use_go_fileserver", "fileserver", "use_go_fileserver",
NULL); NULL);
if (session->go_fileserver) {
char *type = NULL;
type = g_key_file_get_string (config, "database", "type", NULL);
if (!type || g_strcmp0 (type, "mysql") != 0) {
session->go_fileserver = FALSE;
}
g_free (type);
}
if (load_database_config (session) < 0) { if (load_database_config (session) < 0) {
seaf_warning ("Failed to load database config.\n"); seaf_warning ("Failed to load database config.\n");