From cc9f7c06b39ce840d0dcde36e816cf025bd7ce81 Mon Sep 17 00:00:00 2001 From: x12xx12x <44411062+12xx12@users.noreply.github.com> Date: Wed, 23 Jun 2021 00:09:06 +0200 Subject: Add optional prefix parameter to LOG functions (#5229) Co-authored-by: Tiger Wang --- Server/Plugins/APIDump/APIDesc.lua | 118 +++++++++++++++----------------- Server/Plugins/APIDump/main_APIDump.lua | 4 +- Server/Plugins/DumpInfo/Init.lua | 2 +- 3 files changed, 59 insertions(+), 65 deletions(-) (limited to 'Server') diff --git a/Server/Plugins/APIDump/APIDesc.lua b/Server/Plugins/APIDump/APIDesc.lua index af6049fba..5d571c799 100644 --- a/Server/Plugins/APIDump/APIDesc.lua +++ b/Server/Plugins/APIDump/APIDesc.lua @@ -10931,14 +10931,26 @@ a_Player:OpenWindow(Window); }, SendMessage = { - Params = { + Params = { - Name = "Message", - Type = "string", + { + Name = "Message", + Type = "string", + }, }, + Notes = "Sends the specified message to the player.", + }, + { + Params = + { + { + Name = "Message", + Type = "cCompositeChat", + }, + }, + Notes = "Sends the {{cCompositeChat}} to the player, using a severity defined by the CompositeChat's MessageType.", }, - Notes = "Sends the specified message to the player.", }, SendMessageRaw = { @@ -14590,8 +14602,13 @@ end Name = "Message", Type = "string", }, + { + Name = "SuppressPluginNamePrefix", + Type = "boolean", + IsOptional = true, + }, }, - Notes = "Logs a text into the server console and logfile using 'normal' severity (gray text)", + Notes = "Logs a text into the server console and logfile using 'normal' severity (gray text).", }, { Params = @@ -14600,101 +14617,78 @@ end Name = "Message", Type = "cCompositeChat", }, + { + Name = "SuppressPluginNamePrefix", + Type = "boolean", + IsOptional = true, + }, }, - Notes = "Logs the {{cCompositeChat}}'s human-readable text into the server console. The severity is converted from the CompositeChat's MessageType.", + Notes = "Logs the {{cCompositeChat}}'s human-readable text into the server console, using a severity defined by the CompositeChat's MessageType.", }, }, LOGERROR = { + Params = { - Params = { - { - Name = "Message", - Type = "string", - }, + Name = "Message", + Type = "string", }, - Notes = "Logs a text into the server console and logfile using 'error' severity (black text on red background)", - }, - { - Params = { - { - Name = "Message", - Type = "cCompositeChat", - }, + Name = "SuppressPluginNamePrefix", + Type = "boolean", + IsOptional = true, }, - Notes = "Logs the {{cCompositeChat}}'s human-readable text into the server console and logfile using 'error' severity (black text on red background)", }, + Notes = "Logs a text into the server console and logfile using 'error' severity (black text on red background).", }, LOGINFO = { + Params = { - Params = { - { - Name = "Message", - Type = "string", - }, + Name = "Message", + Type = "string", }, - Notes = "Logs a text into the server console and logfile using 'info' severity (yellow text)", - }, - { - Params = { - { - Name = "Message", - Type = "cCompositeChat", - }, + Name = "SuppressPluginNamePrefix", + Type = "boolean", + IsOptional = true, }, - Notes = "Logs the {{cCompositeChat}}'s human-readable text into the server console and logfile using 'info' severity (yellow text)", }, + Notes = "Logs a text into the server console and logfile using 'info' severity (yellow text).", }, LOGWARN = { + Params = { - Params = { - { - Name = "Message", - Type = "string", - }, + Name = "Message", + Type = "string", }, - Notes = "Logs a text into the server console and logfile using 'warning' severity (red text); OBSOLETE, use LOGWARNING() instead", - }, - { - Params = { - { - Name = "Message", - Type = "cCompositeChat", - }, + Name = "SuppressPluginNamePrefix", + Type = "boolean", + IsOptional = true, }, - Notes = "Logs the {{cCompositeChat}}'s human-readable text into the server console and logfile using 'warning' severity (red text); OBSOLETE, use LOGWARNING() instead", }, + Notes = "Logs a text into the server console and logfile using 'warning' severity (red text); OBSOLETE, use LOGWARNING() instead.", }, LOGWARNING = { + Params = { - Params = { - { - Name = "Message", - Type = "string", - }, + Name = "Message", + Type = "string", }, - Notes = "Logs a text into the server console and logfile using 'warning' severity (red text)", - }, - { - Params = { - { - Name = "Message", - Type = "cCompositeChat", - }, + Name = "SuppressPluginNamePrefix", + Type = "boolean", + IsOptional = true, }, - Notes = "Logs the {{cCompositeChat}}'s human-readable text into the server console and logfile using 'warning' severity (red text)", }, + Notes = "Logs a text into the server console and logfile using 'warning' severity (red text).", }, md5 = { diff --git a/Server/Plugins/APIDump/main_APIDump.lua b/Server/Plugins/APIDump/main_APIDump.lua index 61dd1e66c..b1277ca0b 100644 --- a/Server/Plugins/APIDump/main_APIDump.lua +++ b/Server/Plugins/APIDump/main_APIDump.lua @@ -36,7 +36,7 @@ local function LoadAPIFiles(a_Folder, a_DstTable) if (a_DstTable[k]) then -- The class is documented in two files, warn and store into a file (so that CIs can mark build as failure): LOGWARNING(string.format( - "APIDump warning: class %s is documented at two places, the documentation in file %s will overwrite the previously loaded one!", + "Warning: class %s is documented at two places, the documentation in file %s will overwrite the previously loaded one!", k, FileName )) local f = io.open("DuplicateDocs.txt", "a") @@ -2115,7 +2115,7 @@ function Initialize(Plugin) g_Plugin = Plugin; g_PluginFolder = Plugin:GetLocalFolder(); - LOG("Initialising " .. Plugin:GetName() .. " v." .. Plugin:GetVersion()) + LOG("Initialising v." .. Plugin:GetVersion()) -- Bind a console command to dump the API: cPluginManager:BindConsoleCommand("api", HandleCmdApi, "Dumps the Lua API docs into the API/ subfolder") diff --git a/Server/Plugins/DumpInfo/Init.lua b/Server/Plugins/DumpInfo/Init.lua index 8b328c862..723ab3d94 100644 --- a/Server/Plugins/DumpInfo/Init.lua +++ b/Server/Plugins/DumpInfo/Init.lua @@ -4,7 +4,7 @@ function Initialize(a_Plugin) -- Check if the infodump file exists. if (not cFile:IsFile("Plugins/InfoDump.lua")) then - LOGWARN("[DumpInfo] InfoDump.lua was not found.") + LOGWARN("InfoDump.lua was not found.") return false end -- cgit v1.2.3