Add option to build http server (#648)

* Add option to build httpserver * Add option to build libevhtp * Delete unused option --------- Co-authored-by: 杨赫然 <[email protected]>
haiwen · Mar 13, 2024 · 98315cc · 98315cc
1 parent bd6b87c
commit 98315cc
Show file tree

Hide file tree

Showing 19 changed files with 146 additions and 90 deletions.
diff --git a/common/fs-mgr.c b/common/fs-mgr.c
@@ -660,7 +660,7 @@ chunking_worker (gpointer vdata, gpointer user_data)
     if (chunk->result < 0)
         goto out;
 
-    idx = chunk->offset / seaf->http_server->fixed_block_size;
+    idx = chunk->offset / seaf->fixed_block_size;
     memcpy (data->blk_sha1s + idx * CHECKSUM_LENGTH, chunk->checksum, CHECKSUM_LENGTH);
 
 out:
@@ -688,7 +688,7 @@ split_file_to_block (const char *repo_id,
     CDCDescriptor *chunk;
     int ret = 0;
 
-    n_blocks = (file_size + seaf->http_server->fixed_block_size - 1) / seaf->http_server->fixed_block_size;
+    n_blocks = (file_size + seaf->fixed_block_size - 1) / seaf->fixed_block_size;
     block_sha1s = g_new0 (uint8_t, n_blocks * CHECKSUM_LENGTH);
     if (!block_sha1s) {
         seaf_warning ("Failed to allocate block_sha1s.\n");
@@ -708,7 +708,7 @@ split_file_to_block (const char *repo_id,
     data.finished_tasks = finished_tasks;
 
     tpool = g_thread_pool_new (chunking_worker, &data,
-                               seaf->http_server->max_indexing_threads, FALSE, NULL);
+                               seaf->max_indexing_threads, FALSE, NULL);
     if (!tpool) {
         seaf_warning ("Failed to allocate thread pool\n");
         ret = -1;
@@ -719,7 +719,7 @@ split_file_to_block (const char *repo_id,
     guint64 len;
     guint64 left = (guint64)file_size;
     while (left > 0) {
-        len = ((left >= seaf->http_server->fixed_block_size) ? seaf->http_server->fixed_block_size : left);
+        len = ((left >= seaf->fixed_block_size) ? seaf->fixed_block_size : left);
 
         chunk = g_new0 (CDCDescriptor, 1);
         chunk->offset = offset;
@@ -739,7 +739,7 @@ split_file_to_block (const char *repo_id,
             goto out;
         }
         if (indexed)
-            *indexed += seaf->http_server->fixed_block_size;
+            *indexed += seaf->fixed_block_size;
 
         if ((--n_pending) <= 0) {
             if (indexed)

diff --git a/common/merge-new.c b/common/merge-new.c
@@ -1,3 +1,5 @@
+#include "common.h"
+
 #include "seafile-session.h"
 #include "merge-new.h"
 #include "vc-common.h"

diff --git a/common/rpc-service.c b/common/rpc-service.c
@@ -1436,15 +1436,23 @@ seafile_web_query_access_token (const char *token, GError **error)
 char *
 seafile_query_zip_progress (const char *token, GError **error)
 {
+#ifdef HAVE_EVHTP
     return zip_download_mgr_query_zip_progress (seaf->zip_download_mgr,
                                                 token, error);
+#else
+    return NULL;
+#endif
 }
 
 int
 seafile_cancel_zip_task (const char *token, GError **error)
 {
+#ifdef HAVE_EVHTP
     return zip_download_mgr_cancel_zip_task (seaf->zip_download_mgr,
                                              token);
+#else
+    return 0;
+#endif
 }
 
 int
@@ -3751,7 +3759,9 @@ seafile_delete_repo_tokens_by_peer_id(const char *email,
         return -1;
     }
 
+#ifdef HAVE_EVHTP
     seaf_http_server_invalidate_tokens(seaf->http_server, tokens);
+#endif
     g_list_free_full (tokens, (GDestroyNotify)g_free);
     return 0;
 }

diff --git a/configure.ac b/configure.ac
@@ -91,10 +91,12 @@ AC_ARG_WITH(mysql,
             [MYSQL_CONFIG=$with_mysql],
 	    [MYSQL_CONFIG="default_mysql_config"])
 
+AC_ARG_ENABLE(httpserver, AC_HELP_STRING([--enable-httpserver], [enable httpserver]),
+   [compile_httpserver=$enableval],[compile_httpserver="yes"])
+
 AM_CONDITIONAL([COMPILE_TOOLS], [test "${compile_tools}" = "yes"])
 AM_CONDITIONAL([COMPILE_PYTHON], [test "${compile_python}" = "yes"])
 AM_CONDITIONAL([COMPILE_FUSE], [test "${compile_fuse}" = "yes"])
-
 AM_CONDITIONAL([WIN32], [test "$bwin32" = "true"])
 AM_CONDITIONAL([MACOS], [test "$bmac" = "true"])
 AM_CONDITIONAL([LINUX], [test "$blinux" = "true"])
@@ -260,6 +262,10 @@ if test "${compile_ldap}" = "yes"; then
 
 fi
 
+if test "${compile_httpserver}" = "yes"; then
+    AC_DEFINE([HAVE_EVHTP], [1], [Define to 1 if httpserver is enabled.])
+fi
+
 PKG_CHECK_MODULES(CURL, [libcurl >= $CURL_REQUIRED])
 AC_SUBST(CURL_CFLAGS)
 AC_SUBST(CURL_LIBS)

diff --git a/server/access-file.c b/server/access-file.c
@@ -1,5 +1,6 @@
 #include "common.h"
 
+#ifdef HAVE_EVHTP
 #define DEBUG_FLAG SEAFILE_DEBUG_HTTP
 #include "log.h"
 
@@ -1546,3 +1547,4 @@ access_file_init (evhtp_t *htp)
 
     return 0;
 }
+#endif
diff --git a/server/access-file.h b/server/access-file.h
@@ -1,7 +1,9 @@
 #ifndef ACCESS_FILE_H
 #define ACCESS_FILE_H
 
+#ifdef HAVE_EVHTP
 int
 access_file_init (evhtp_t *htp);
+#endif
 
 #endif
diff --git a/server/http-server.c b/server/http-server.c
@@ -1,5 +1,6 @@
 #include "common.h"
 
+#ifdef HAVE_EVHTP
 #include <pthread.h>
 #include <string.h>
 #include <jansson.h>
@@ -63,6 +64,7 @@
 struct _HttpServer {
     evbase_t *evbase;
     evhtp_t *evhtp;
+    event_t *reap_timer;
     pthread_t thread_id;
 
     GHashTable *token_cache;
@@ -74,8 +76,6 @@ struct _HttpServer {
     GHashTable *vir_repo_info_cache;
     pthread_mutex_t vir_repo_info_cache_lock;
 
-    event_t *reap_timer;
-
     GThreadPool *compute_fs_obj_id_pool;
 
     GHashTable *fs_obj_ids;
@@ -150,11 +150,7 @@ load_http_config (HttpServerStruct *htp_server, SeafileSession *session)
     char *host = NULL;
     int port = 0;
     int worker_threads;
-    int web_token_expire_time;
-    int fixed_block_size_mb;
     char *encoding;
-    int max_indexing_threads;
-    int max_index_processing_threads;
     char *cluster_shared_temp_file_mode = NULL;
 
     host = fileserver_config_get_string (session->config, HOST, &error);
@@ -198,66 +194,6 @@ load_http_config (HttpServerStruct *htp_server, SeafileSession *session)
     }
     seaf_message ("fileserver: worker_threads = %d\n", htp_server->worker_threads);
 
-    fixed_block_size_mb = fileserver_config_get_integer (session->config,
-                                                  "fixed_block_size",
-                                                  &error);
-    if (error){
-        htp_server->fixed_block_size = DEFAULT_FIXED_BLOCK_SIZE;
-        g_clear_error(&error);
-    } else {
-        if (fixed_block_size_mb <= 0)
-            htp_server->fixed_block_size = DEFAULT_FIXED_BLOCK_SIZE;
-        else
-            htp_server->fixed_block_size = fixed_block_size_mb * ((gint64)1 << 20);
-    }
-    seaf_message ("fileserver: fixed_block_size = %"G_GINT64_FORMAT"\n",
-                  htp_server->fixed_block_size);
-
-    web_token_expire_time = fileserver_config_get_integer (session->config,
-                                                "web_token_expire_time",
-                                                &error);
-    if (error){
-        htp_server->web_token_expire_time = 3600; /* default 3600s */
-        g_clear_error(&error);
-    } else {
-        if (web_token_expire_time <= 0)
-            htp_server->web_token_expire_time = 3600; /* default 3600s */
-        else
-            htp_server->web_token_expire_time = web_token_expire_time;
-    }
-    seaf_message ("fileserver: web_token_expire_time = %d\n",
-                  htp_server->web_token_expire_time);
-
-    max_indexing_threads = fileserver_config_get_integer (session->config,
-                                                          "max_indexing_threads",
-                                                          &error);
-    if (error) {
-        htp_server->max_indexing_threads = DEFAULT_MAX_INDEXING_THREADS;
-        g_clear_error (&error);
-    } else {
-        if (max_indexing_threads <= 0)
-            htp_server->max_indexing_threads = DEFAULT_MAX_INDEXING_THREADS;
-        else
-            htp_server->max_indexing_threads = max_indexing_threads;
-    }
-    seaf_message ("fileserver: max_indexing_threads = %d\n",
-                  htp_server->max_indexing_threads);
-
-    max_index_processing_threads = fileserver_config_get_integer (session->config,
-                                                                  "max_index_processing_threads",
-                                                                  &error);
-    if (error) {
-        htp_server->max_index_processing_threads = DEFAULT_MAX_INDEX_PROCESSING_THREADS;
-        g_clear_error (&error);
-    } else {
-        if (max_index_processing_threads <= 0)
-            htp_server->max_index_processing_threads = DEFAULT_MAX_INDEX_PROCESSING_THREADS;
-        else
-            htp_server->max_index_processing_threads = max_index_processing_threads;
-    }
-    seaf_message ("fileserver: max_index_processing_threads= %d\n",
-                  htp_server->max_index_processing_threads);
-
     cluster_shared_temp_file_mode = fileserver_config_get_string (session->config,
                                                                   "cluster_shared_temp_file_mode",
                                                                   &error);
@@ -3154,3 +3090,5 @@ seaf_http_server_invalidate_tokens (HttpServerStruct *htp_server,
     pthread_mutex_unlock (&htp_server->priv->token_cache_lock);
     return 0;
 }
+
+#endif
diff --git a/server/http-server.h b/server/http-server.h
@@ -1,6 +1,7 @@
 #ifndef HTTP_SERVER_H
 #define HTTP_SERVER_H
 
+#ifdef HAVE_EVHTP
 #include <glib.h>
 
 struct _SeafileSession;
@@ -16,11 +17,7 @@ struct _HttpServerStruct {
     int bind_port;
     char *http_temp_dir;        /* temp dir for file upload */
     char *windows_encoding;
-    gint64 fixed_block_size;
-    int web_token_expire_time;
-    int max_indexing_threads;
     int worker_threads;
-    int max_index_processing_threads;
     int cluster_shared_temp_file_mode;
 };
 
@@ -38,5 +35,6 @@ seaf_http_server_invalidate_tokens (HttpServerStruct *htp_server,
 
 void
 send_statistic_msg (const char *repo_id, char *user, char *operation, guint64 bytes);
+#endif
 
 #endif
diff --git a/server/index-blocks-mgr.c b/server/index-blocks-mgr.c
@@ -74,7 +74,7 @@ index_blocks_mgr_new (SeafileSession *session)
 
     priv->idx_tpool = g_thread_pool_new (start_index_task,
                                          priv,
-                                         session->http_server->max_index_processing_threads,
+                                         session->max_index_processing_threads,
                                          FALSE, &error);
     if (!priv->idx_tpool) {
         if (error) {

diff --git a/server/pack-dir.c b/server/pack-dir.c
@@ -1,4 +1,5 @@
 #include "common.h"
+#ifdef HAVE_EVHTP
 
 #define DEBUG_FLAG SEAFILE_DEBUG_HTTP
 #include "log.h"
@@ -481,3 +482,4 @@ pack_files (const char *store_id,
 
     return ret;
 }
+#endif
diff --git a/server/pack-dir.h b/server/pack-dir.h
@@ -1,5 +1,6 @@
 #ifndef PACK_DIR_H
 #define PACK_DIR_H
+#ifdef HAVE_EVHTP
 
 /* Pack a seafile directory to a zipped archive, saved in a temporary file.
    Return the path of this temporary file.
@@ -23,5 +24,6 @@ pack_files (const char *store_id,
             SeafileCrypt *crypt,
             gboolean is_windows,
             Progress *progress);
+#endif
 
 #endif
diff --git a/server/repo-mgr.c b/server/repo-mgr.c
@@ -1553,7 +1553,9 @@ seaf_repo_manager_delete_token (SeafRepoManager *mgr,
 
     GList *tokens = NULL;
     tokens = g_list_append (tokens, g_strdup(token));
+#ifdef HAVE_EVHTP
     seaf_http_server_invalidate_tokens (seaf->http_server, tokens);
+#endif
     g_list_free_full (tokens, (GDestroyNotify)g_free);
 
     return 0;
@@ -1838,7 +1840,9 @@ seaf_repo_manager_delete_repo_tokens_by_email (SeafRepoManager *mgr,
         goto out;
     }
 
+#ifdef HAVE_EVHTP
     seaf_http_server_invalidate_tokens (seaf->http_server, token_list);
+#endif
 
 out:
     g_list_free_full (token_list, (GDestroyNotify)g_free);