diff --git a/cms-core/configs/server.yaml b/cms-core/configs/server.yaml new file mode 100644 index 000000000..947627319 --- /dev/null +++ b/cms-core/configs/server.yaml @@ -0,0 +1,15 @@ +server: + port: 8080 + ip: "127.0.0.1" +env: dev +test: only in yaml +ipc: + port: 6868 + password: test_pwd +apm: + enabled: false + max_requests: 100 + thread_limit: 10 +# experimental settings +performance: + pool_enabled: false \ No newline at end of file diff --git a/cms-core/src/main/java/com/condation/cms/core/configuration/ConfigurationFactory.java b/cms-core/src/main/java/com/condation/cms/core/configuration/ConfigurationFactory.java index 05e560dfb..3818c0152 100644 --- a/cms-core/src/main/java/com/condation/cms/core/configuration/ConfigurationFactory.java +++ b/cms-core/src/main/java/com/condation/cms/core/configuration/ConfigurationFactory.java @@ -173,4 +173,4 @@ private static TaxonomyConfiguration taxonomyConfiguration(EventBus eventBus, Pa .addSource(TomlConfigSource.build(hostBase.resolve("config/taxonomy.toml"))) .build(); } -} +} \ No newline at end of file diff --git a/cms-core/src/main/java/com/condation/cms/core/configuration/configs/SimpleConfiguration.java b/cms-core/src/main/java/com/condation/cms/core/configuration/configs/SimpleConfiguration.java index 85e5428a7..7f449c9c6 100644 --- a/cms-core/src/main/java/com/condation/cms/core/configuration/configs/SimpleConfiguration.java +++ b/cms-core/src/main/java/com/condation/cms/core/configuration/configs/SimpleConfiguration.java @@ -208,4 +208,4 @@ public SimpleConfiguration build () { return new SimpleConfiguration(this); } } -} +} \ No newline at end of file diff --git a/cms-core/src/main/java/com/condation/cms/core/configuration/source/TomlConfigSource.java b/cms-core/src/main/java/com/condation/cms/core/configuration/source/TomlConfigSource.java index 13962cbfa..bee21ad7d 100644 --- a/cms-core/src/main/java/com/condation/cms/core/configuration/source/TomlConfigSource.java +++ b/cms-core/src/main/java/com/condation/cms/core/configuration/source/TomlConfigSource.java @@ -173,4 +173,4 @@ public Map toMap() { } } -} +} \ No newline at end of file diff --git a/cms-core/src/test/java/com/condation/cms/core/configuration/ConfigurationTest.java b/cms-core/src/test/java/com/condation/cms/core/configuration/ConfigurationTest.java index 0984683a3..367a88c11 100644 --- a/cms-core/src/test/java/com/condation/cms/core/configuration/ConfigurationTest.java +++ b/cms-core/src/test/java/com/condation/cms/core/configuration/ConfigurationTest.java @@ -129,4 +129,4 @@ public static class Server { private int port; private String ip; } -} +} \ No newline at end of file diff --git a/test-server/hosts/demo/site-dev.toml b/test-server/hosts/demo/site-dev.toml new file mode 100644 index 000000000..eb2cd86dc --- /dev/null +++ b/test-server/hosts/demo/site-dev.toml @@ -0,0 +1 @@ +hostname = [ "localhost5" ] \ No newline at end of file