ExternalVendorCode/HIRS
1
0
Fork 0
mirror of https://github.com/nsacyber/HIRS.git synced 2024-12-18 20:47:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Log error messages instead of printing to console

Browse Source
This commit is contained in:
chubtub 2024-02-16 11:23:02 -05:00
parent eb77981e41
commit d7823b6b0b
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tools/tcg_rim_tool/src/main/java/hirs/swid/Main.java
View File

@ -4,6 +4,7 @@ import hirs.swid.utils.Commander;
import hirs.swid.utils.TimestampArgumentValidator;
import hirs.utils.rim.ReferenceManifestValidator;
import com.beust.jcommander.JCommander;
import lombok.extern.log4j.Log4j2;
import java.io.File;
import java.io.IOException;
@ -12,13 +13,17 @@ import java.nio.file.Paths;
import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@Log4j2
public class Main {
public static void main(String[] args) {
Commander commander = new Commander();
JCommander jc = JCommander.newBuilder().addObject(commander).build();
jc.parse(args);
try {
jc.parse(args);
} catch (Exception e) {
exitWithErrorCode(e.getMessage());
}
SwidTagGateway gateway;
ReferenceManifestValidator validator;
List<String> unknownOpts = commander.getUnknownOptions();
@ -121,7 +126,7 @@ public class Main {
gateway.generateSwidTag(commander.getOutFile());
break;
default:
exitWithErrorCode("No create type given, nothing to do");
exitWithErrorCode("Create type not recognized.");
}
}
}
@ -131,8 +136,7 @@ public class Main {
* Use cases that exit with an error code are redirected here.
*/
private static void exitWithErrorCode(String errorMessage) {
//TODO: log errorMessage
System.out.println(errorMessage);
log.error(errorMessage);
System.exit(1);
}