zdm/envoy
Archived
3
Fork 0
Code Issues 22 Pull Requests Releases 1 Wiki Activity

Use EnvoyLog for all packages

Browse Source
This commit is contained in:
Kai S. K. Engelbart
2020-06-11 11:45:17 +02:00
parent fd1d7e5473
commit 7e14bb5cd8
1 changed files with 30 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/main/java/envoy/server/Startup.java
View File

@@ -1,26 +1,22 @@
package envoy.server; package envoy.server;
import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.Set; import java.util.Set;
import java.util.logging.Level;
import com.jenkov.nioserver.Server; import com.jenkov.nioserver.Server;
import envoy.server.data.ConfigItem; import envoy.data.Config;
import envoy.data.ConfigItem;
import envoy.server.data.PersistenceManager; import envoy.server.data.PersistenceManager;
import envoy.server.net.ConnectionManager; import envoy.server.net.ConnectionManager;
import envoy.server.net.ObjectMessageProcessor; import envoy.server.net.ObjectMessageProcessor;
import envoy.server.net.ObjectMessageReader; import envoy.server.net.ObjectMessageReader;
import envoy.server.processors.ContactOperationProcessor; import envoy.server.processors.*;
import envoy.server.processors.ContactsRequestEventProcessor; import envoy.util.EnvoyLog;
import envoy.server.processors.GroupCreationProcessor;
import envoy.server.processors.GroupMessageProcessor;
import envoy.server.processors.IDGeneratorRequestProcessor;
import envoy.server.processors.LoginCredentialProcessor;
import envoy.server.processors.MessageProcessor;
import envoy.server.processors.MessageStatusChangeProcessor;
import envoy.server.processors.ObjectProcessor;
import envoy.server.processors.UserStatusChangeProcessor;
/** /**
* Starts the server.<br> * Starts the server.<br>
@@ -34,6 +30,25 @@ import envoy.server.processors.UserStatusChangeProcessor;
*/ */
public class Startup { public class Startup {
/**
* Initializes the logger with a new config instance.
*
* @since Envoy Server Standalone v0.1-beta
*/
private static void initLogging() {
final var items = new HashMap<String, ConfigItem<?>>();
items.put("homeDirectory",
new ConfigItem<>("homeDirectory", "h", File::new, new File(System.getProperty("user.home"), ".envoy-server"), true));
items.put("fileLevelBarrier", new ConfigItem<>("fileLevelBarrier", "fb", Level::parse, Level.SEVERE, true));
items.put("consoleLevelBarrier", new ConfigItem<>("consoleLevelBarrier", "cb", Level::parse, Level.INFO, true));
final var config = new Config();
config.load(items);
EnvoyLog.initialize(config);
EnvoyLog.attach("");
}
/** /**
* Starts the server. * Starts the server.
* *
@@ -42,6 +57,8 @@ public class Startup {
* @since Envoy Server Standalone v0.1-alpha * @since Envoy Server Standalone v0.1-alpha
*/ */
public static void main(String[] args) throws IOException { public static void main(String[] args) throws IOException {
initLogging();
Set<ObjectProcessor<?>> processors = new HashSet<>(); Set<ObjectProcessor<?>> processors = new HashSet<>();
processors.add(new LoginCredentialProcessor()); processors.add(new LoginCredentialProcessor());
processors.add(new MessageProcessor()); processors.add(new MessageProcessor());
@@ -52,12 +69,12 @@ public class Startup {
processors.add(new IDGeneratorRequestProcessor()); processors.add(new IDGeneratorRequestProcessor());
processors.add(new ContactsRequestEventProcessor()); processors.add(new ContactsRequestEventProcessor());
processors.add(new ContactOperationProcessor()); processors.add(new ContactOperationProcessor());
Server server = new Server(8080, () -> new ObjectMessageReader(), new ObjectMessageProcessor(processors)); Server server = new Server(8080, ObjectMessageReader::new, new ObjectMessageProcessor(processors));
// Initialize the current message ID // Initialize the current message ID
PersistenceManager persistenceManager = PersistenceManager.getInstance(); PersistenceManager persistenceManager = PersistenceManager.getInstance();
if (persistenceManager.getConfigItemByID("currentMessageId") == null) if (persistenceManager.getConfigItemByID("currentMessageId") == null)
persistenceManager.addConfigItem(new ConfigItem("currentMessageId", "0")); persistenceManager.addConfigItem(new envoy.server.data.ConfigItem("currentMessageId", "0"));
server.start(); server.start();
server.getSocketProcessor().registerSocketIdListener(ConnectionManager.getInstance()); server.getSocketProcessor().registerSocketIdListener(ConnectionManager.getInstance());