forked from Telodendria/Telodendria
Compare commits
No commits in common. "a089224630f7434b6b50ee3d166e410400b39224" and "18ae52d001402a7b0963c962272d7c288c5aedd0" have entirely different histories.
a089224630
...
18ae52d001
4 changed files with 0 additions and 31 deletions
|
@ -75,7 +75,6 @@
|
||||||
"serverName": { "type": "string", "required": true },
|
"serverName": { "type": "string", "required": true },
|
||||||
"baseUrl": { "type": "string", "required": false },
|
"baseUrl": { "type": "string", "required": false },
|
||||||
"identityServer": { "type": "string", "required": false },
|
"identityServer": { "type": "string", "required": false },
|
||||||
"pid": { "type": "string", "required": false },
|
|
||||||
|
|
||||||
"maxCache": { "type": "integer", "required": false },
|
"maxCache": { "type": "integer", "required": false },
|
||||||
|
|
||||||
|
|
|
@ -31,7 +31,6 @@ The following endpoints were added:
|
||||||
|
|
||||||
### Bug Fixes & General Improvements
|
### Bug Fixes & General Improvements
|
||||||
|
|
||||||
- Use `j2s` for parsing the configuration
|
|
||||||
- Fixed a double-free in `RouteUserProfile()` that would cause errors
|
- Fixed a double-free in `RouteUserProfile()` that would cause errors
|
||||||
with certain Matrix clients. (#35)
|
with certain Matrix clients. (#35)
|
||||||
- Improved compatibility with NetBSD on various platforms.
|
- Improved compatibility with NetBSD on various platforms.
|
||||||
|
@ -44,8 +43,6 @@ parsing request bodies.
|
||||||
|
|
||||||
### New Features
|
### New Features
|
||||||
|
|
||||||
- Implemented a `"pid"` option in the configuration, allowing Telodendria
|
|
||||||
to write its process ID to a specified file.
|
|
||||||
- Moved all administrator API endpoints to `/_telodendria/admin/v1`,
|
- Moved all administrator API endpoints to `/_telodendria/admin/v1`,
|
||||||
because later revisions of the administrator API may break clients, so
|
because later revisions of the administrator API may break clients, so
|
||||||
we want a way to give those breaking revisions new endpoints.
|
we want a way to give those breaking revisions new endpoints.
|
||||||
|
|
|
@ -106,9 +106,6 @@ Here are the top-level directives:
|
||||||
or you want to start over. **serverName** should be a DNS name that
|
or you want to start over. **serverName** should be a DNS name that
|
||||||
can be publicly resolved. This directive is required.
|
can be publicly resolved. This directive is required.
|
||||||
|
|
||||||
- **pid:** `String`
|
|
||||||
Configure the file Telodendria writes its PID to.
|
|
||||||
|
|
||||||
- **baseUrl:** `String`
|
- **baseUrl:** `String`
|
||||||
|
|
||||||
Set the server's base URL. **baseUrl** should be a valid URL,
|
Set the server's base URL. **baseUrl** should be a valid URL,
|
||||||
|
|
24
src/Main.c
24
src/Main.c
|
@ -104,9 +104,6 @@ Main(Array * args)
|
||||||
/* Program configuration */
|
/* Program configuration */
|
||||||
Config *tConfig;
|
Config *tConfig;
|
||||||
Stream *logFile;
|
Stream *logFile;
|
||||||
Stream *pidFile = NULL;
|
|
||||||
|
|
||||||
char *pidPath = NULL;
|
|
||||||
|
|
||||||
/* User validation */
|
/* User validation */
|
||||||
struct passwd *userInfo;
|
struct passwd *userInfo;
|
||||||
|
@ -338,21 +335,6 @@ start:
|
||||||
Free(token);
|
Free(token);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (tConfig->pid)
|
|
||||||
{
|
|
||||||
pidFile = StreamOpen(tConfig->pid, "w+");
|
|
||||||
if (!pidFile)
|
|
||||||
{
|
|
||||||
char *msg = "Couldn't lock PID file at '%s'";
|
|
||||||
Log(LOG_ERR, msg, tConfig->pid);
|
|
||||||
exit = EXIT_FAILURE;
|
|
||||||
goto finish;
|
|
||||||
}
|
|
||||||
pidPath = StrDuplicate(tConfig->pid);
|
|
||||||
StreamPrintf(pidFile, "%ld", (long) getpid());
|
|
||||||
StreamClose(pidFile);
|
|
||||||
}
|
|
||||||
|
|
||||||
Log(LOG_DEBUG, "Configuration:");
|
Log(LOG_DEBUG, "Configuration:");
|
||||||
LogConfigIndent(LogConfigGlobal());
|
LogConfigIndent(LogConfigGlobal());
|
||||||
Log(LOG_DEBUG, "Server Name: %s", tConfig->serverName);
|
Log(LOG_DEBUG, "Server Name: %s", tConfig->serverName);
|
||||||
|
@ -622,12 +604,6 @@ finish:
|
||||||
HttpRouterFree(matrixArgs.router);
|
HttpRouterFree(matrixArgs.router);
|
||||||
Log(LOG_DEBUG, "Freed routing tree.");
|
Log(LOG_DEBUG, "Freed routing tree.");
|
||||||
|
|
||||||
if (pidPath)
|
|
||||||
{
|
|
||||||
remove(pidPath);
|
|
||||||
Free(pidPath);
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Uninstall the memory hook because it uses the Log
|
* Uninstall the memory hook because it uses the Log
|
||||||
* API, whose configuration is being freed now, so it
|
* API, whose configuration is being freed now, so it
|
||||||
|
|
Loading…
Reference in a new issue