latticeware/Telodendria
1
0
Fork 0
forked from Telodendria/Telodendria
Code Pull requests Activity

Add a Db to the matrixArgs so that routes can access it.

Browse source
This commit is contained in:
Jordan Bancino 2022-10-24 14:36:48 -04:00
parent 3a181653b5
commit f90b987218
2 changed files with 18 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/Telodendria.c
View file

@ -38,6 +38,7 @@
#include <Config.h> #include <Config.h>
#include <HttpServer.h> #include <HttpServer.h>
#include <Matrix.h> #include <Matrix.h>
#include <Db.h>
static void static void
TelodendriaMemoryHook(MemoryAction a, MemoryInfo * i, void *args) TelodendriaMemoryHook(MemoryAction a, MemoryInfo * i, void *args)
@ -418,6 +419,20 @@ main(int argc, char **argv)
tConfig->uid = NULL; tConfig->uid = NULL;
tConfig->gid = NULL; tConfig->gid = NULL;
matrixArgs.db = DbOpen(".", tConfig->maxCache);
if (!tConfig->maxCache)
{
Log(lc, LOG_WARNING, "Max-cache is set to zero; caching is disabled.");
}
if (!matrixArgs.db)
{
Log(lc, LOG_ERROR, "Unable to open data directory as a database.");
exit = EXIT_FAILURE;
goto finish;
}
Log(lc, LOG_TASK, "Starting server..."); Log(lc, LOG_TASK, "Starting server...");
if (!HttpServerStart(httpServer)) if (!HttpServerStart(httpServer))
@ -452,6 +467,7 @@ finish:
Log(lc, LOG_DEBUG, "Freed HTTP Server."); Log(lc, LOG_DEBUG, "Freed HTTP Server.");
} }
TelodendriaConfigFree(tConfig); TelodendriaConfigFree(tConfig);
DbClose(matrixArgs.db);
Log(lc, LOG_DEBUG, ""); Log(lc, LOG_DEBUG, "");
MemoryIterate(TelodendriaMemoryIterator, lc); MemoryIterate(TelodendriaMemoryIterator, lc);

2
src/include/Matrix.h
View file

@ -29,6 +29,7 @@
#include <HashMap.h> #include <HashMap.h>
#include <TelodendriaConfig.h> #include <TelodendriaConfig.h>
#include <Db.h>
/* /*
* Abstract away the underlying data structure of the path so that * Abstract away the underlying data structure of the path so that
@ -90,6 +91,7 @@ typedef struct MatrixHttpHandlerArgs
{ {
LogConfig *lc; LogConfig *lc;
TelodendriaConfig *config; TelodendriaConfig *config;
Db *db;
} MatrixHttpHandlerArgs; } MatrixHttpHandlerArgs;
extern void extern void