cqrenet/mxids
3
0
Fork 0
Code Pull Requests 10 Actions Releases Activity

Update ma1sd to mxids

Browse Source
This commit is contained in:
Tomas Kracmar
2024-03-27 14:10:04 +01:00
parent 1d228d75e6
commit c9bafd9af2
16 changed files with 65 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/io/kamax/mxisd/MxisdStandaloneExec.java
View File

@@ -36,7 +36,7 @@ public class MxisdStandaloneExec {
private static final Logger log = LoggerFactory.getLogger("App");
public static void main(String[] args) {
String logLevel = System.getenv("MA1SD_LOG_LEVEL");
String logLevel = System.getenv("MXIDS_LOG_LEVEL");
if (StringUtils.isNotBlank(logLevel)) {
System.setProperty("org.slf4j.simpleLogger.log.io.kamax.mxisd", logLevel);
}
@@ -59,8 +59,8 @@ public class MxisdStandaloneExec {
System.out.println(" -c, --config Set the configuration file location");
System.out.println(" -v Increase log level (log more info)");
System.out.println(" -vv Further increase log level");
System.out.println(" --dump Dump the full ma1sd configuration");
System.out.println(" --dump-and-exit Dump the full ma1sd configuration and exit");
System.out.println(" --dump Dump the full mxids configuration");
System.out.println(" --dump-and-exit Dump the full mxids configuration and exit");
System.out.println(" ");
System.exit(0);
return;
@@ -88,7 +88,7 @@ public class MxisdStandaloneExec {
}
if (Objects.isNull(cfg)) {
cfg = YamlConfigLoader.tryLoadFromFile("ma1sd.yaml").orElseGet(MxisdConfig::new);
cfg = YamlConfigLoader.tryLoadFromFile("mxids.yaml").orElseGet(MxisdConfig::new);
}
if (dump) {
@@ -98,17 +98,17 @@ public class MxisdStandaloneExec {
}
}
log.info("ma1sd starting");
log.info("mxids starting");
log.info("Version: {}", Mxisd.Version);
HttpMxisd mxisd = new HttpMxisd(cfg);
Runtime.getRuntime().addShutdownHook(new Thread(() -> {
mxisd.stop();
log.info("ma1sd stopped");
log.info("mxids stopped");
}));
mxisd.start();
log.info("ma1sd started");
log.info("mxids started");
} catch (ConfigurationException e) {
log.error(e.getDetailedMessage());
log.error(e.getMessage());

14
src/main/java/io/kamax/mxisd/config/rest/RestBackendConfig.java
View File

@@ -33,8 +33,8 @@ public class RestBackendConfig {
public static class IdentityEndpoints {
private String single = "/_ma1sd/backend/api/v1/identity/single";
private String bulk = "/_ma1sd/backend/api/v1/identity/bulk";
private String single = "/_mxids/backend/api/v1/identity/single";
private String bulk = "/_mxids/backend/api/v1/identity/bulk";
public String getSingle() {
return single;
@@ -56,9 +56,9 @@ public class RestBackendConfig {
public static class ProfileEndpoints {
private String displayName = "/_ma1sd/backend/api/v1/profile/displayName";
private String threepids = "/_ma1sd/backend/api/v1/profile/threepids";
private String roles = "/_ma1sd/backend/api/v1/profile/roles";
private String displayName = "/_mxids/backend/api/v1/profile/displayName";
private String threepids = "/_mxids/backend/api/v1/profile/threepids";
private String roles = "/_mxids/backend/api/v1/profile/roles";
public String getDisplayName() {
return displayName;
@@ -88,8 +88,8 @@ public class RestBackendConfig {
public static class Endpoints {
private String auth = "/_ma1sd/backend/api/v1/auth/login";
private String directory = "/_ma1sd/backend/api/v1/directory/user/search";
private String auth = "/_mxids/backend/api/v1/auth/login";
private String directory = "/_mxids/backend/api/v1/directory/user/search";
private IdentityEndpoints identity = new IdentityEndpoints();
private ProfileEndpoints profile = new ProfileEndpoints();

4
src/main/java/io/kamax/mxisd/exception/TermsNotSignedException.java
View File

@@ -1,8 +1,8 @@
/*
* ma1sd - Matrix Identity Server Daemon
* mxids - Matrix Identity Server Daemon
* Copyright (C) 2020 Anatoliy SAblin
*
* https://www.github.com/ma1uta/ma1sd/
* https://git.cqre.net/cqrenet/mxids/
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as

2
src/main/java/io/kamax/mxisd/http/undertow/handler/internal/InternalInviteManagerHandler.java
View File

@@ -10,7 +10,7 @@ import java.util.concurrent.Executors;
public class InternalInviteManagerHandler extends BasicHttpHandler {
public static final String PATH = "/_ma1sd/internal/admin/inv_manager";
public static final String PATH = "/_mxids/internal/admin/inv_manager";
private final InvitationManager invitationManager;
private final ExecutorService executors = Executors.newFixedThreadPool(1);