Merge branch 'master' into 1.2.0-alpha

infinistor · Dec 9, 2022 · 4cc36fe · 4cc36fe
2 parents eebfbd5 + 49efc5f
commit 4cc36fe
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 1 deletion.
diff --git a/docker/serivce/ksanlifecycle.service b/docker/serivce/ksanlifecycle.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=KSAN GW Service
+Requires=docker.service
+After=docker.service
+
+[Service]
+Restart=always
+ExecStart=/usr/bin/docker start -a ksan-lifecycle
+ExecStop=/usr/bin/docker stop -t 2 ksan-lifecycle
+
+[Install]
+WantedBy=multi-user.target
diff --git a/portal/Models/PortalModels/PortalModels.PortalModelDiagram.view b/portal/Models/PortalModels/PortalModels.PortalModelDiagram.view
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <EntityDeveloperDiagram>
 	<Diagram Version="1.22.3.0">
 		<DiagramModel>

diff --git a/portal/Models/PortalModels/PortalModels.csproj b/portal/Models/PortalModels/PortalModels.csproj
@@ -164,6 +164,10 @@
 			<AutoGen>True</AutoGen>
 			<DependentUpon>PortalModels.efml</DependentUpon>
 		</Compile>
+		<Compile Update="PortalModels.ServiceEventLog.cs">
+			<AutoGen>True</AutoGen>
+			<DependentUpon>PortalModels.efml</DependentUpon>
+		</Compile>
 		<Compile Update="PortalModels.ServiceGroup.cs">
 			<AutoGen>True</AutoGen>
 			<DependentUpon>PortalModels.efml</DependentUpon>

diff --git a/portal/PortalSvr/Services/ConfigurationInitializer.cs b/portal/PortalSvr/Services/ConfigurationInitializer.cs
@@ -162,6 +162,28 @@ public async Task Initialize()
 					var Result = await m_configProvider.SetConfig(EnumServiceType.ksanReplicationManager, StrKsanReplicationManager);
 					if (Result != null && Result.Result == EnumResponseResult.Success) await m_configProvider.SetConfigLastVersion(EnumServiceType.ksanReplicationManager, Result.Data.Version);
 				}
+
+				// KsanLogManager 설정이 없는 경우
+				var KsanLogManagerConfig = await m_configProvider.GetConfig(EnumServiceType.ksanLogManager);
+				if (KsanLogManagerConfig == null || KsanLogManagerConfig.Result == EnumResponseResult.Error)
+				{
+					// Ksan Gw의 기본 설정 정보를 읽어온다.
+					string StrKsanLogManager = File.ReadAllText(EnvironmentInitializer.KSAN_LOGMANAGER_SETTINGS_FILE);
+
+					var Result = await m_configProvider.SetConfig(EnumServiceType.ksanLogManager, StrKsanLogManager);
+					if (Result != null && Result.Result == EnumResponseResult.Success) await m_configProvider.SetConfigLastVersion(EnumServiceType.ksanLogManager, Result.Data.Version);
+				}
+
+				// KsanReplication 설정이 없는 경우
+				var KsanReplicationConfig = await m_configProvider.GetConfig(EnumServiceType.ksanReplication);
+				if (KsanReplicationConfig == null || KsanReplicationConfig.Result == EnumResponseResult.Error)
+				{
+					// Ksan Gw의 기본 설정 정보를 읽어온다.
+					string StrKsanReplication = File.ReadAllText(EnvironmentInitializer.KSAN_REPLICATION_SETTINGS_FILE);
+
+					var Result = await m_configProvider.SetConfig(EnumServiceType.ksanReplication, StrKsanReplication);
+					if (Result != null && Result.Result == EnumResponseResult.Success) await m_configProvider.SetConfigLastVersion(EnumServiceType.ksanReplication, Result.Data.Version);
+				}
 			}
 			catch (Exception ex)
 			{