Skip to content

Commit 4b98a0f

Browse files
committed
testmode added in package creater
1 parent 16a88a9 commit 4b98a0f

File tree

2 files changed

+24
-14
lines changed

2 files changed

+24
-14
lines changed

src/LCT.Common/Logging/LoggerHelper.cs

Lines changed: 24 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -713,6 +713,12 @@ private static void AppendCreatorSpecificInfo(StringBuilder content, CommonAppSe
713713
.Append($" └──> {appSettings.SW360.IgnoreDevDependency}\n\n")
714714
.Append($"[green]-[/] [cyan]LogFolderPath[/]\n")
715715
.Append($" └──> {WrapPath(Log4Net.CatoolLogPath, maxPathLength)}\n\n");
716+
if (appSettings.IsTestMode)
717+
{
718+
content
719+
.Append($"[green]-[/] [cyan]Mode[/]\n")
720+
.Append($" └──> {appSettings.Mode}\n\n");
721+
}
716722
}
717723

718724

@@ -775,17 +781,24 @@ private static void LogInputParametersWithLog4net(CatoolInfo caToolInformation,
775781
}
776782
else if (exeType == Dataconstant.Creator)
777783
{
778-
Logger.Logger.Log(null, Level.Notice, $"Input parameters used in Package Creator:\n\t" +
779-
$"CaToolVersion\t\t --> {caToolInformation.CatoolVersion}\n\t" +
780-
$"CaToolRunningPath\t --> {caToolInformation.CatoolRunningLocation}\n\t" +
781-
$"BomFilePath\t\t --> {bomFilePath}\n\t" +
782-
$"SW360Url\t\t --> {appSettings.SW360.URL}\n\t" +
783-
$"SW360ProjectName\t --> {appSettings.SW360.ProjectName}\n\t" +
784-
$"SW360ProjectID\t\t --> {appSettings.SW360.ProjectID}\n\t" +
785-
$"FossologyURL\t\t --> {appSettings.SW360.Fossology.URL}\n\t" +
786-
$"EnableFossTrigger\t --> {appSettings.SW360.Fossology.EnableTrigger}\n\t" +
787-
$"IgnoreDevDependency\t --> {appSettings.SW360.IgnoreDevDependency}\n\t" +
788-
$"LogFolderPath\t\t --> {Log4Net.CatoolLogPath}\n\t", null);
784+
var creatorMessage =
785+
$"Input parameters used in Package Creator:\n\t" +
786+
$"CaToolVersion\t\t --> {caToolInformation.CatoolVersion}\n\t" +
787+
$"CaToolRunningPath\t --> {caToolInformation.CatoolRunningLocation}\n\t" +
788+
$"BomFilePath\t\t --> {bomFilePath}\n\t" +
789+
$"SW360Url\t\t --> {appSettings.SW360.URL}\n\t" +
790+
$"SW360ProjectName\t --> {appSettings.SW360.ProjectName}\n\t" +
791+
$"SW360ProjectID\t\t --> {appSettings.SW360.ProjectID}\n\t" +
792+
$"FossologyURL\t\t --> {appSettings.SW360.Fossology.URL}\n\t" +
793+
$"EnableFossTrigger\t --> {appSettings.SW360.Fossology.EnableTrigger}\n\t" +
794+
$"IgnoreDevDependency\t --> {appSettings.SW360.IgnoreDevDependency}\n\t";
795+
796+
if (appSettings.IsTestMode)
797+
{
798+
creatorMessage += $"Mode\t\t --> {appSettings.Mode}\n\t";
799+
}
800+
creatorMessage += $"LogFolderPath\t\t --> {Log4Net.CatoolLogPath}\n\t";
801+
Logger.Logger.Log(null, Level.Notice, creatorMessage, null);
789802
}
790803
else if (exeType == Dataconstant.Uploader)
791804
{

src/LCT.SW360PackageCreator/Program.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,6 @@ static async Task Main(string[] args)
7878
ListofPerametersForCli listofPerameters = new ListofPerametersForCli();
7979
LoggerHelper.LogInputParameters(caToolInformation, appSettings, listofPerameters, exeType: Dataconstant.Creator, bomFilePath: bomFilePath);
8080

81-
if (appSettings.IsTestMode)
82-
Logger.Logger.Log(null, Level.Notice, $"\tMode\t\t\t --> {appSettings.Mode}\n", null);
83-
8481
//Validate Fossology Url
8582
if (appSettings.SW360.Fossology.EnableTrigger && !appSettings.IsTestMode)
8683
{

0 commit comments

Comments
 (0)