NewLife
/
Stardust
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

升级服务管理 NewLife.Agent

This commit is contained in:
大石头 2020-03-29 19:21:15 +08:00
parent 43673e8f5f
commit b1d64cdd3a
8 changed files with 35 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
StarAgent/Program.cs
View File

@ -1,9 +1,11 @@
using System;
using System.Diagnostics;
using System.Threading.Tasks;
using System.IO;
using System.Reflection;
using NewLife;
using NewLife.Agent;
using NewLife.Log;
using NewLife.Reflection;
using NewLife.Threading;
using Stardust;
@ -15,7 +17,7 @@ namespace StarAgent
}
/// <summary>服务类。名字可以自定义</summary>
class MyService : AgentServiceBase<MyService>
class MyService : ServiceBase
{
public MyService()
{
@ -32,7 +34,8 @@ namespace StarAgent
}
// 注册菜单，在控制台菜单中按 t 可以执行Test函数，主要用于临时处理数据
AddMenu('t', "测试", Test);
if (set.Server != "http://star.newlifex.com:6600") AddMenu('s', "使用星尘", UseStarServer);
AddMenu('t', "服务器信息", ShowMachineInfo);
}
TimerX _timer;
@ -75,7 +78,6 @@ namespace StarAgent
{
var client = state as StarClient;
var set = Setting.Current;
//Task.Run(client.Login).ContinueWith(t => CheckUpgrade(client, set.Channel));
client.Login().Wait();
CheckUpgrade(client, set.Channel);
@ -144,69 +146,25 @@ namespace StarAgent
}
}
#region 自动发现服务端
//private ApiClient _udp;
//private TimerX _udp_timer;
//private void StartDiscover()
//{
// var tc = new ApiClient("udp://255.255.255.255:6666")
// {
// UsePool = false,
// Log = XTrace.Log,
// EncoderLog = XTrace.Log,
// Timeout = 1_000
// };
// tc.Open();
// // 定时广播
// _udp_timer = new TimerX(OnDiscover, tc, 0, 5_000) { Async = true };
// _udp = tc;
//}
//private void OnDiscover(Object state)
//{
// //var udp = new UdpServer();
// //udp.Log = XTrace.Log;
// //var ep = new IPEndPoint(IPAddress.Broadcast, 6666);
// //var session = udp.CreateSession(ep);
// //session.Send("Hello");
// var tc = state as ApiClient;
// var dic = tc.Invoke<IDictionary<String, Object>>("Discover", new { state = DateTime.Now.ToFullString() });
// if (dic == null || dic.Count == 0) return;
// var str = dic["Server"] + "";
// if (str.IsNullOrEmpty()) return;
// //WriteLog("收到[{0}]：{1}", tc, str);
// if (!str.IsNullOrEmpty())
// {
// var uri = new NetUri(str);
// if (!uri.Host.IsNullOrEmpty() && uri.Port > 0)
// {
// WriteLog("发现服务器：{0}", uri);
// // 停止广播
// _udp_timer.TryDispose();
// _udp_timer = null;
// _udp.TryDispose();
// _udp = null;
// InitClient(str);
// }
// }
//}
#endregion
/// <summary>数据测试，菜单t</summary>
public void Test()
public void UseStarServer()
{
var set = Setting.Current;
set.Server = "http://star.newlifex.com:6600";
set.Save();
}
public void ShowMachineInfo()
{
XTrace.WriteLine("FullPath:{0}", ".".GetFullPath());
XTrace.WriteLine("BasePath:{0}", ".".GetBasePath());
XTrace.WriteLine("TempPath:{0}", Path.GetTempPath());
var mi = MachineInfo.Current ?? MachineInfo.RegisterAsync().Result;
foreach (var pi in mi.GetType().GetProperties(BindingFlags.Public | BindingFlags.Instance))
{
XTrace.WriteLine("{0}:\t{1}", pi.Name, mi.GetValue(pi));
}
}
}
}

6
StarAgent/StarAgent.csproj
View File

@ -7,8 +7,8 @@
<Description>星尘，分布式资源调度，客户端代理部署于每一台机器节点，接受服务端命令，获取目标应用包并拉起进程。</Description>
<Company>新生命开发团队</Company>
<Copyright>©2002-2020 NewLife</Copyright>
<Version>1.0.2020.0312</Version>
<FileVersion>1.0.2020.0312</FileVersion>
<Version>1.0.2020.0329</Version>
<FileVersion>1.0.2020.0329</FileVersion>
<AssemblyVersion>1.0.*</AssemblyVersion>
<Deterministic>false</Deterministic>
<OutputPath>..\BinClient</OutputPath>
@ -42,7 +42,7 @@
<PackageReference Include="System.ServiceProcess.ServiceController" Version="4.5.0" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="NewLife.Agent" Version="8.7.2020.322-beta" />
<PackageReference Include="NewLife.Agent" Version="8.7.2020.329-beta" />
</ItemGroup>
<ItemGroup>

4
Stardust.Data/Stardust.Data.csproj
View File

@ -45,8 +45,8 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="NewLife.Core" Version="8.7.2020.324-beta" />
<PackageReference Include="NewLife.XCode" Version="9.16.2020.324-beta" />
<PackageReference Include="NewLife.Core" Version="8.7.2020.329-beta" />
<PackageReference Include="NewLife.XCode" Version="9.16.2020.329-beta" />
</ItemGroup>
<ItemGroup>

2
Stardust.Server/Stardust.Server.csproj
View File

@ -32,7 +32,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="NewLife.XCode" Version="9.16.2020.324-beta" />
<PackageReference Include="NewLife.XCode" Version="9.16.2020.329-beta" />
</ItemGroup>
<ItemGroup>

6
Stardust.Web/Stardust.Web.csproj
View File

@ -27,9 +27,9 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="NewLife.Core" Version="8.7.2020.324-beta" />
<PackageReference Include="NewLife.Cube.Core" Version="3.3.2020.322-beta" />
<PackageReference Include="NewLife.XCode" Version="9.16.2020.324-beta" />
<PackageReference Include="NewLife.Core" Version="8.7.2020.329-beta" />
<PackageReference Include="NewLife.Cube.Core" Version="3.3.2020.329-beta" />
<PackageReference Include="NewLife.XCode" Version="9.16.2020.329-beta" />
</ItemGroup>
<ItemGroup>

2
Stardust/Stardust.csproj
View File

@ -49,7 +49,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="NewLife.Core" Version="8.7.2020.324-beta" />
<PackageReference Include="NewLife.Core" Version="8.7.2020.329-beta" />
</ItemGroup>
</Project>

2
Test/Test.csproj
View File

@ -8,7 +8,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="NewLife.Core" Version="8.7.2020.324-beta" />
<PackageReference Include="NewLife.Core" Version="8.7.2020.329-beta" />
</ItemGroup>
<ItemGroup>

12
星尘.sln
View File

@ -27,10 +27,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ClientTest", "ClientTest\ClientTest.csproj", "{7DE10A4D-1749-4474-A6B2-F52CA8462813}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StarAgent2", "StarAgent2\StarAgent2.csproj", "{8F868ED3-102A-446C-AC1B-D635FF7EA772}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StarAgent3", "StarAgent3\StarAgent3.csproj", "{29BD9661-DE43-4AA5-A2D0-0106CBE5AF54}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@ -65,14 +61,6 @@ Global
{7DE10A4D-1749-4474-A6B2-F52CA8462813}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7DE10A4D-1749-4474-A6B2-F52CA8462813}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7DE10A4D-1749-4474-A6B2-F52CA8462813}.Release|Any CPU.Build.0 = Release|Any CPU
{8F868ED3-102A-446C-AC1B-D635FF7EA772}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8F868ED3-102A-446C-AC1B-D635FF7EA772}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8F868ED3-102A-446C-AC1B-D635FF7EA772}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8F868ED3-102A-446C-AC1B-D635FF7EA772}.Release|Any CPU.Build.0 = Release|Any CPU
{29BD9661-DE43-4AA5-A2D0-0106CBE5AF54}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{29BD9661-DE43-4AA5-A2D0-0106CBE5AF54}.Debug|Any CPU.Build.0 = Debug|Any CPU
{29BD9661-DE43-4AA5-A2D0-0106CBE5AF54}.Release|Any CPU.ActiveCfg = Release|Any CPU
{29BD9661-DE43-4AA5-A2D0-0106CBE5AF54}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE