Skip to content

Commit

Permalink
fixed logs issues
Browse files Browse the repository at this point in the history
  • Loading branch information
Valkirie committed Nov 16, 2021
1 parent b30c4ac commit daffff1
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 18 deletions.
19 changes: 10 additions & 9 deletions ControllerService/ControllerService.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -82,9 +82,9 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Crc32.NET" Version="1.2.0" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="5.0.0" />
<PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="5.0.1" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.2">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
Expand All @@ -95,21 +95,22 @@
<PackageReference Include="Nefarius.ViGEm.Client" Version="1.17.178" />
<PackageReference Include="NetCoreNamedPipeWrapper" Version="1.0.4" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="Serilog.Extensions.Logging" Version="3.0.1" />
<PackageReference Include="Serilog.Settings.Configuration" Version="3.2.0" />
<PackageReference Include="Serilog.Extensions.Hosting" Version="4.2.0" />
<PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0" />
<PackageReference Include="Serilog.Settings.Configuration" Version="3.3.0" />
<PackageReference Include="Serilog.Sinks.Console" Version="4.0.0" />
<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
<PackageReference Include="SharpDX" Version="4.2.0" />
<PackageReference Include="SharpDX.XInput" Version="4.2.0" />
<PackageReference Include="System.Buffers" Version="4.5.1" />
<PackageReference Include="System.Management" Version="5.0.0" />
<PackageReference Include="System.Management" Version="6.0.0" />
<PackageReference Include="System.Memory" Version="4.5.4" />
<PackageReference Include="System.Numerics.Vectors" Version="4.5.0" />
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="5.0.0" />
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
<PackageReference Include="System.Runtime.WindowsRuntime" Version="4.7.0" />
<PackageReference Include="System.Runtime.WindowsRuntime.UI.Xaml" Version="4.7.0" />
<PackageReference Include="System.Text.Encodings.Web" Version="5.0.1" />
<PackageReference Include="System.Text.Json" Version="5.0.2" />
<PackageReference Include="System.Text.Encodings.Web" Version="6.0.0" />
<PackageReference Include="System.Text.Json" Version="6.0.0" />
<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
<PackageReference Include="System.ValueTuple" Version="4.5.0" />
</ItemGroup>
Expand Down
3 changes: 3 additions & 0 deletions ControllerService/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Logging;
using Serilog;
using System;

namespace ControllerService
{
Expand All @@ -20,11 +21,13 @@ public static IHostBuilder CreateHostBuilder(string[] args)
.ConfigureServices((hostContext, services) =>
{
var configuration = new ConfigurationBuilder()
.SetBasePath(AppDomain.CurrentDomain.BaseDirectory)
.AddJsonFile("appsettings.json")
.Build();

var logger = new LoggerConfiguration()
.ReadFrom.Configuration(configuration)
.WriteTo.File($"{AppDomain.CurrentDomain.BaseDirectory}\\Logs\\ControllerService.log",rollingInterval: RollingInterval.Day)
.CreateLogger();

services.AddLogging(builder =>
Expand Down
1 change: 1 addition & 0 deletions ControllerService/appsettings.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
},
"Serilog": {
"Using": [ "Serilog.Sinks.File", "Serilog.Sinks.Console" ],
"MinimumLevel": "Information",
"WriteTo": [
{
"Name": "File",
Expand Down
21 changes: 12 additions & 9 deletions ControllerService/install.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,14 @@ echo.
echo Controller Service Deployement Script
echo.

rmdir /Q /S Logs
mkdir Logs

echo Installing HidHide
msiexec /i dependencies\HidHideMSI.msi /quiet /qn /norestart /log HidHideSetup.log
msiexec /i dependencies\HidHideMSI.msi /quiet /qn /norestart /log "Logs\HidHideSetup.log"

echo Installing ViGEm
msiexec /i dependencies\ViGEmBusSetup_x64.msi /quiet /qn /norestart /log ViGEmBusSetup.log
msiexec /i dependencies\ViGEmBusSetup_x64.msi /quiet /qn /norestart /log "Logs\ViGEmBusSetup.log"

echo Installing DirectX
dependencies\dxwebsetup.exe /q
Expand All @@ -19,23 +22,23 @@ echo Installing Windows Desktop Runtime 5.0.12
dependencies\windowsdesktop-runtime-5.0.12-win-x64.exe /install /quiet /norestart

echo Creating LocalDumps registry key
REG ADD "HKLM\SOFTWARE\Microsoft\Windows\Windows Error Reporting\LocalDumps\ControllerService.exe" /f >> ControllerServiceSetup.log
REG ADD "HKLM\SOFTWARE\Microsoft\Windows\Windows Error Reporting\LocalDumps\ControllerService.exe" /v "DumpFolder" /t REG_EXPAND_SZ /d "%cd%" /f >> ControllerServiceSetup.log
REG ADD "HKLM\SOFTWARE\Microsoft\Windows\Windows Error Reporting\LocalDumps\ControllerService.exe" /f >> "Logs\ControllerServiceSetup.log"
REG ADD "HKLM\SOFTWARE\Microsoft\Windows\Windows Error Reporting\LocalDumps\ControllerService.exe" /v "DumpFolder" /t REG_EXPAND_SZ /d "%cd%" /f >> "Logs\ControllerServiceSetup.log"

echo Uninstalling previous installation
sc.exe stop "ControllerService" >> ControllerServiceSetup.log
sc.exe stop "ControllerService" >> "Logs\ControllerServiceSetup.log"
timeout /t 3 /nobreak > nul
sc.exe delete "ControllerService" >> ControllerServiceSetup.log
sc.exe delete "ControllerService" >> "Logs\ControllerServiceSetup.log"
timeout /t 3 /nobreak > nul

echo Installing Controller Service
sc.exe create "ControllerService" binpath= "%cd%\ControllerService.exe" start= "auto" DisplayName= "Controller Service" >> ControllerServiceSetup.log
sc.exe create "ControllerService" binpath= "%cd%\ControllerService.exe" start= "auto" DisplayName= "Controller Service" >> "Logs\ControllerServiceSetup.log"
timeout /t 2 /nobreak > nul
sc.exe description "ControllerService" "Provides gyroscope and accelerometer support to the AYA NEO 2020, 2021 models through a virtual DualShock 4 controller. If the service is enabled, embedded controller will be cloaked to applications outside the whitelist. If the service is disabled, embedded controller will be uncloaked and virtual DualShock 4 controller disabled." >> ControllerServiceSetup.log
sc.exe description "ControllerService" "Provides gyroscope and accelerometer support to the AYA NEO 2020, 2021 models through a virtual DualShock 4 controller. If the service is enabled, embedded controller will be cloaked to applications outside the whitelist. If the service is disabled, embedded controller will be uncloaked and virtual DualShock 4 controller disabled." >> "Logs\ControllerServiceSetup.log"
timeout /t 2 /nobreak > nul

echo Starting Controller Service
sc.exe start "ControllerService" >> ControllerServiceSetup.log
sc.exe start "ControllerService" >> "Logs\ControllerServiceSetup.log"
timeout /t 2 /nobreak > nul

echo.
Expand Down

0 comments on commit daffff1

Please sign in to comment.