DESKTOP-Kang 6 rokov pred
rodič
commit
017fbaa416

+ 4 - 0
Dev/OHV/OHV.Vehicle/Concept/D_MainWindowViewModel.cs

@@ -1,4 +1,5 @@
 using CommonServiceLocator;
+using GSG.NET.Logging;
 using GSG.NET.Utils;
 using OHV.Common.Events;
 using OHV.Common.Model;
@@ -27,6 +28,8 @@ namespace OHV.Vehicle.Concept
 {
     class D_MainWindowViewModel : BindableBase
     {
+        Logger loggerRemote = Logger.GetLogger("RemoteLogger");
+
         private string _title = "Prism Unity Application";
         public string Title
         {
@@ -269,6 +272,7 @@ namespace OHV.Vehicle.Concept
 
         private void ExecuteAlarmResetCommand( )
         {
+            loggerRemote.I("1231435463547");
         }
 
         private void ExecuteStopCommand()

+ 22 - 2
Dev/OHV/OHV.Vehicle/Config/log4net.xml

@@ -17,7 +17,11 @@
 		<appender-ref ref="PIOAppender" />
 	</logger>
 
-	<!--
+  <logger name="RemoteLogger" additivity="false">
+    <appender-ref ref="remotingAppender" />
+  </logger>
+
+  <!--
 	ALL    DEBUG   INFO    WARN    ERROR   FATAL   OFF
 	•All
 	•DEBUG  •DEBUG
@@ -93,7 +97,23 @@
 		</layout>
 	</appender>
 
-	<appender name="ConsoleAppender" type="log4net.Appender.ConsoleAppender"   >
+  <appender name="remotingAppender" type="log4net.Appender.RemotingAppender">
+    <!-- The remoting URL to the remoting server object -->
+    <sink value="tcp://172.20.0.197:8085/Log4netRemotingServerService"/>
+    <!-- Send all events, do not discard events when the buffer is full -->
+    <lossy value="false"/>
+    <!-- The number of events to buffer before sending -->
+    <bufferSize value="10"/>
+    <!-- Do not store event data that is slow to generate -->
+    <onlyFixPartialEventData value="true"/>
+    <!-- Specify an evaluator to send the events immediately under certain conditions, e.g. when an error event ocurrs -->
+    <evaluator type="log4net.Core.LevelEvaluator">
+      <threshold value="WARN"/>
+    </evaluator>
+  </appender>
+
+
+  <appender name="ConsoleAppender" type="log4net.Appender.ConsoleAppender"   >
 		<layout type="log4net.Layout.PatternLayout">
 			<param name="ConversionPattern" value="%d %m%n" />
 		</layout>

+ 31 - 32
Dev/OHV/VehicleControlSystem/ControlLayer/Vehicle.cs

@@ -288,44 +288,12 @@ namespace VehicleControlSystem.ControlLayer
             }
         }
 
-        //private void DriveControlEventPublish( DriveControlEventArgs args ) { }
-
         private void DriveControlEventPublish(DriveControlEventArgs args)
         {
             args.EventDir = DriveControlEventArgs.eEventDir.ToFront;
             this.eventAggregator.GetEvent<DriveControlPubSubEvent>().Publish(args);
         }
 
-        public void Init()
-        {
-            this.CreateClamp();
-            this.CreateSteering();
-
-            ThreadStart();
-
-            //TimerUtils.Once(5000, () => { this.CurrentPosition = 1000; });
-        }
-
-        public int InitializationVehicle()
-        {
-            int result = 0;
-            if (this.IsDetectedCenter()) //자제가 있으면 Lock
-                result = this.clamp.Lock_Sync();
-            else
-                result = this.clamp.Unlock_Sync();
-
-            if (this.motion.IsErrorOn)
-                return 22;
-
-            return result;
-        }
-
-        public void Dispose()
-        {
-            this.cancel.Cancel();
-            this.cancel.StopWaitAll();
-        }
-
         #region Request Method
 
         private void ReqVehicleState(DriveControlEventArgs args)
@@ -442,6 +410,37 @@ namespace VehicleControlSystem.ControlLayer
         }
         #endregion
 
+        public void Init()
+        {
+            this.CreateClamp();
+            this.CreateSteering();
+
+            ThreadStart();
+
+            //TimerUtils.Once(5000, () => { this.CurrentPosition = 1000; });
+        }
+
+        public int InitializationVehicle()
+        {
+            int result = 0;
+            if (this.IsDetectedCenter()) //자제가 있으면 Lock
+                result = this.clamp.Lock_Sync();
+            else
+                result = this.clamp.Unlock_Sync();
+
+            if (this.motion.IsErrorOn)
+                return 22;
+
+            return result;
+        }
+
+        public void Dispose()
+        {
+            this.cancel.Cancel();
+            this.cancel.StopWaitAll();
+        }
+
+
         #region Thread
         void ThreadStart()
         {