cleanup start messages
This commit is contained in:
parent
506302eb9c
commit
4b37fbb352
11 changed files with 53 additions and 19 deletions
|
|
@ -11,8 +11,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Project Items", "Project It
|
||||||
.gitignore = .gitignore
|
.gitignore = .gitignore
|
||||||
SecondBotEvents\Dockerfile = SecondBotEvents\Dockerfile
|
SecondBotEvents\Dockerfile = SecondBotEvents\Dockerfile
|
||||||
NuGet.Config = NuGet.Config
|
NuGet.Config = NuGet.Config
|
||||||
|
oldDockerfile = oldDockerfile
|
||||||
README.md = README.md
|
README.md = README.md
|
||||||
oldDockerfile. = oldDockerfile.
|
SecondBotEvents\settings.env = SecondBotEvents\settings.env
|
||||||
EndProjectSection
|
EndProjectSection
|
||||||
EndProject
|
EndProject
|
||||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SecondBotEvents", "SecondBotEvents\SecondBotEvents.csproj", "{571AB1AF-4C74-4C37-AC5B-9B63383AC791}"
|
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SecondBotEvents", "SecondBotEvents\SecondBotEvents.csproj", "{571AB1AF-4C74-4C37-AC5B-9B63383AC791}"
|
||||||
|
|
|
||||||
|
|
@ -892,9 +892,14 @@ namespace OpenMetaverse
|
||||||
OnSimDisconnected(new SimDisconnectedEventArgs(CurrentSim, type));
|
OnSimDisconnected(new SimDisconnectedEventArgs(CurrentSim, type));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if (_packetInbox != null)
|
||||||
_packetInbox.Writer.Complete();
|
{
|
||||||
_packetOutbox.Writer.Complete();
|
_packetInbox.Writer.Complete();
|
||||||
|
}
|
||||||
|
if (_packetOutbox != null)
|
||||||
|
{
|
||||||
|
_packetOutbox.Writer.Complete();
|
||||||
|
}
|
||||||
|
|
||||||
_packetInbox = null;
|
_packetInbox = null;
|
||||||
_packetOutbox = null;
|
_packetOutbox = null;
|
||||||
|
|
|
||||||
|
|
@ -32,6 +32,7 @@ ENV basic_Username = 'SecondbotR5' \
|
||||||
commands_MastersCSV = 'Madpeter Zond' \
|
commands_MastersCSV = 'Madpeter Zond' \
|
||||||
commands_EnforceTimeWindow = 'false' \
|
commands_EnforceTimeWindow = 'false' \
|
||||||
commands_TimeWindowSecs = 35 \
|
commands_TimeWindowSecs = 35 \
|
||||||
|
commands_Enabled='true' \
|
||||||
datastore_AutoCleanAvatars = 'true' \
|
datastore_AutoCleanAvatars = 'true' \
|
||||||
datastore_AvatarsCleanAfterMins = 10 \
|
datastore_AvatarsCleanAfterMins = 10 \
|
||||||
datastore_LocalChatHistoryLimit = 120 \
|
datastore_LocalChatHistoryLimit = 120 \
|
||||||
|
|
@ -72,13 +73,13 @@ ENV basic_Username = 'SecondbotR5' \
|
||||||
homebound_AtHomeAutoSitUuid = '00000000-0000-0000-0000-000000000000' \
|
homebound_AtHomeAutoSitUuid = '00000000-0000-0000-0000-000000000000' \
|
||||||
http_Enabled = 'false' \
|
http_Enabled = 'false' \
|
||||||
http_Port = 80 \
|
http_Port = 80 \
|
||||||
Enabled = 'true' \
|
interaction_Enabled = 'true' \
|
||||||
AcceptTeleports = 'false' \
|
interaction_AcceptTeleports = 'false' \
|
||||||
AcceptGroupInvites = 'false' \
|
interaction_AcceptGroupInvites = 'false' \
|
||||||
AcceptInventory = 'false' \
|
interaction_AcceptInventory = 'false' \
|
||||||
AcceptFriendRequests = 'false' \
|
interaction_AcceptFriendRequests = 'false' \
|
||||||
EnableJsonOutputEvents = 'false' \
|
interaction_EnableJsonOutputEvents = 'false' \
|
||||||
JsonOutputEventsTarget = 'none'
|
interaction_JsonOutputEventsTarget = 'none'
|
||||||
|
|
||||||
EXPOSE 80
|
EXPOSE 80
|
||||||
ENV ASPNETCORE_URLS http://+:80
|
ENV ASPNETCORE_URLS http://+:80
|
||||||
|
|
|
||||||
|
|
@ -45,9 +45,12 @@ namespace SecondBotEvents.Services
|
||||||
}
|
}
|
||||||
public override void Stop()
|
public override void Stop()
|
||||||
{
|
{
|
||||||
|
if(running == true)
|
||||||
|
{
|
||||||
|
Console.WriteLine("Client service [Stopping]");
|
||||||
|
}
|
||||||
running = false;
|
running = false;
|
||||||
AutoRestartLoginTimer.Stop();
|
AutoRestartLoginTimer.Stop();
|
||||||
Console.WriteLine("Client service [Stopping]");
|
|
||||||
ResetClient();
|
ResetClient();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -275,7 +275,7 @@ namespace SecondBotEvents.Services
|
||||||
return new KeyValuePair<bool, string>(false, "Unknown command");
|
return new KeyValuePair<bool, string>(false, "Unknown command");
|
||||||
}
|
}
|
||||||
C.command = commandnameLowerToReal[lowerName];
|
C.command = commandnameLowerToReal[lowerName];
|
||||||
if(master.CustomCommandsService.HasCommand(C.command) == false)
|
if(master.CustomCommandsService.HasCommand(C.command) == true)
|
||||||
{
|
{
|
||||||
if(inCustomCommand == true)
|
if(inCustomCommand == true)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -1050,6 +1050,10 @@ namespace SecondBotEvents.Services
|
||||||
|
|
||||||
public override void Stop()
|
public override void Stop()
|
||||||
{
|
{
|
||||||
|
if(running == true)
|
||||||
|
{
|
||||||
|
Console.WriteLine("DataStore Service [Stopping]");
|
||||||
|
}
|
||||||
running = false;
|
running = false;
|
||||||
Reset();
|
Reset();
|
||||||
master.BotClientNoticeEvent -= BotClientRestart;
|
master.BotClientNoticeEvent -= BotClientRestart;
|
||||||
|
|
@ -1070,7 +1074,7 @@ namespace SecondBotEvents.Services
|
||||||
GetClient().Estate.EstateBansReply -= EstateBans;
|
GetClient().Estate.EstateBansReply -= EstateBans;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Console.WriteLine("DataStore Service [Stopping]");
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -432,8 +432,12 @@ namespace SecondBotEvents.Services
|
||||||
|
|
||||||
public override void Stop()
|
public override void Stop()
|
||||||
{
|
{
|
||||||
|
if(running == true)
|
||||||
|
{
|
||||||
|
Console.WriteLine("Discord service [Stopping]");
|
||||||
|
}
|
||||||
running = false;
|
running = false;
|
||||||
Console.WriteLine("Discord service [Stopping]");
|
|
||||||
master.BotClientNoticeEvent -= BotClientRestart;
|
master.BotClientNoticeEvent -= BotClientRestart;
|
||||||
master.SystemStatusMessagesEvent -= SystemStatusEvent;
|
master.SystemStatusMessagesEvent -= SystemStatusEvent;
|
||||||
AcceptEventsFromSL = false;
|
AcceptEventsFromSL = false;
|
||||||
|
|
|
||||||
|
|
@ -286,6 +286,10 @@ namespace SecondBotEvents.Services
|
||||||
|
|
||||||
public override void Stop()
|
public override void Stop()
|
||||||
{
|
{
|
||||||
|
if(running == true)
|
||||||
|
{
|
||||||
|
Console.WriteLine("Homebound Service [Stopping]");
|
||||||
|
}
|
||||||
running = false;
|
running = false;
|
||||||
master.BotClientNoticeEvent -= BotClientRestart;
|
master.BotClientNoticeEvent -= BotClientRestart;
|
||||||
if (master.BotClient != null)
|
if (master.BotClient != null)
|
||||||
|
|
@ -297,7 +301,7 @@ namespace SecondBotEvents.Services
|
||||||
GetClient().Network.SimChanged -= BotChangedSim;
|
GetClient().Network.SimChanged -= BotChangedSim;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Console.WriteLine("Homebound Service [Stopping]");
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -90,6 +90,10 @@ namespace SecondBotEvents.Services
|
||||||
|
|
||||||
public override void Stop()
|
public override void Stop()
|
||||||
{
|
{
|
||||||
|
if(running == true)
|
||||||
|
{
|
||||||
|
Console.WriteLine("HTTP service [Stopping]");
|
||||||
|
}
|
||||||
running = false;
|
running = false;
|
||||||
if (myConfig.GetEnabled() == false)
|
if (myConfig.GetEnabled() == false)
|
||||||
{
|
{
|
||||||
|
|
@ -100,7 +104,7 @@ namespace SecondBotEvents.Services
|
||||||
{
|
{
|
||||||
HTTPendpoint.Dispose();
|
HTTPendpoint.Dispose();
|
||||||
HTTPendpoint = null;
|
HTTPendpoint = null;
|
||||||
Console.WriteLine("HTTP service [Stopping]");
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -197,6 +197,10 @@ namespace SecondBotEvents.Services
|
||||||
|
|
||||||
public override void Stop()
|
public override void Stop()
|
||||||
{
|
{
|
||||||
|
if(running == true)
|
||||||
|
{
|
||||||
|
Console.WriteLine("Interaction Service [Stopping]");
|
||||||
|
}
|
||||||
running = false;
|
running = false;
|
||||||
if (myConfig.GetEnabled() == false)
|
if (myConfig.GetEnabled() == false)
|
||||||
{
|
{
|
||||||
|
|
@ -212,7 +216,7 @@ namespace SecondBotEvents.Services
|
||||||
GetClient().Groups.GroupInvitation -= BotGroupInviteOffer;
|
GetClient().Groups.GroupInvitation -= BotGroupInviteOffer;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Console.WriteLine("Interaction Service [Stopping]");
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -137,6 +137,10 @@ namespace SecondBotEvents.Services
|
||||||
|
|
||||||
public override void Stop()
|
public override void Stop()
|
||||||
{
|
{
|
||||||
|
if(running == true)
|
||||||
|
{
|
||||||
|
Console.WriteLine("Relay Service [Stopping]");
|
||||||
|
}
|
||||||
running = false;
|
running = false;
|
||||||
master.BotClientNoticeEvent -= BotClientRestart;
|
master.BotClientNoticeEvent -= BotClientRestart;
|
||||||
if (master.BotClient != null)
|
if (master.BotClient != null)
|
||||||
|
|
@ -146,7 +150,7 @@ namespace SecondBotEvents.Services
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Console.WriteLine("Relay Service [Stopping]");
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue