aboutsummaryrefslogtreecommitdiffstats
path: root/athenz-identity-provider-service
diff options
context:
space:
mode:
authorgjoranv <gv@verizonmedia.com>2020-04-24 15:47:56 +0200
committergjoranv <gv@verizonmedia.com>2020-04-25 02:24:37 +0200
commit545c7069fbf76932542f80a25aab44fdc972925a (patch)
treedd6aac41e9568cc68ba1f46c0c38609f0f7604bb /athenz-identity-provider-service
parentee9e892838733da49d5ea2b74e456751c05c3f18 (diff)
LogLevel.ERROR -> Level.SEVERE
Diffstat (limited to 'athenz-identity-provider-service')
-rw-r--r--athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/ConfigserverSslContextFactoryProvider.java2
-rw-r--r--athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/identitydocument/IdentityDocumentResource.java2
-rw-r--r--athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/instanceconfirmation/InstanceConfirmationResource.java2
-rw-r--r--athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/instanceconfirmation/InstanceRefreshResource.java2
-rw-r--r--athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/instanceconfirmation/InstanceValidator.java2
5 files changed, 5 insertions, 5 deletions
diff --git a/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/ConfigserverSslContextFactoryProvider.java b/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/ConfigserverSslContextFactoryProvider.java
index a4d9ded9254..ae4a5933ac2 100644
--- a/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/ConfigserverSslContextFactoryProvider.java
+++ b/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/ConfigserverSslContextFactoryProvider.java
@@ -174,7 +174,7 @@ public class ConfigserverSslContextFactoryProvider extends TlsContextBasedProvid
keyManager.updateKeystore(keyStore, keystorePwd);
log.log(Level.INFO, "Certificate successfully updated");
} catch (Throwable t) {
- log.log(LogLevel.ERROR, "Failed to update certificate from ZTS: " + t.getMessage(), t);
+ log.log(Level.SEVERE, "Failed to update certificate from ZTS: " + t.getMessage(), t);
}
}
}
diff --git a/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/identitydocument/IdentityDocumentResource.java b/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/identitydocument/IdentityDocumentResource.java
index b49a35f0506..cb0b1e0557f 100644
--- a/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/identitydocument/IdentityDocumentResource.java
+++ b/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/identitydocument/IdentityDocumentResource.java
@@ -43,7 +43,7 @@ public class IdentityDocumentResource implements IdentityDocumentApi {
return EntityBindingsMapper.toSignedIdentityDocumentEntity(identityDocumentGenerator.generateSignedIdentityDocument(hostname, identityType));
} catch (Exception e) {
String message = String.format("Unable to generate identity doument for '%s': %s", hostname, e.getMessage());
- log.log(LogLevel.ERROR, message, e);
+ log.log(Level.SEVERE, message, e);
throw new InternalServerErrorException(message, e);
}
}
diff --git a/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/instanceconfirmation/InstanceConfirmationResource.java b/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/instanceconfirmation/InstanceConfirmationResource.java
index 2828880ff67..dbe26d3a6bb 100644
--- a/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/instanceconfirmation/InstanceConfirmationResource.java
+++ b/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/instanceconfirmation/InstanceConfirmationResource.java
@@ -34,7 +34,7 @@ public class InstanceConfirmationResource {
public InstanceConfirmation confirmInstance(InstanceConfirmation instanceConfirmation) {
log.log(Level.FINE, instanceConfirmation.toString());
if (!instanceValidator.isValidInstance(instanceConfirmation)) {
- log.log(LogLevel.ERROR, "Invalid instance: " + instanceConfirmation);
+ log.log(Level.SEVERE, "Invalid instance: " + instanceConfirmation);
throw new ForbiddenException("Instance is invalid");
}
return instanceConfirmation;
diff --git a/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/instanceconfirmation/InstanceRefreshResource.java b/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/instanceconfirmation/InstanceRefreshResource.java
index a1eab136aa2..b49e03658e6 100644
--- a/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/instanceconfirmation/InstanceRefreshResource.java
+++ b/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/instanceconfirmation/InstanceRefreshResource.java
@@ -36,7 +36,7 @@ public class InstanceRefreshResource {
public InstanceConfirmation confirmInstanceRefresh(InstanceConfirmation instanceConfirmation) {
log.log(Level.FINE, instanceConfirmation.toString());
if (!instanceValidator.isValidRefresh(instanceConfirmation)) {
- log.log(LogLevel.ERROR, "Invalid instance refresh: " + instanceConfirmation);
+ log.log(Level.SEVERE, "Invalid instance refresh: " + instanceConfirmation);
throw new ForbiddenException("Instance is invalid");
}
return instanceConfirmation;
diff --git a/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/instanceconfirmation/InstanceValidator.java b/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/instanceconfirmation/InstanceValidator.java
index cfc63df4a92..05bbd790ad7 100644
--- a/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/instanceconfirmation/InstanceValidator.java
+++ b/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/instanceconfirmation/InstanceValidator.java
@@ -92,7 +92,7 @@ public class InstanceValidator {
log.log(Level.FINE, () -> String.format("Instance %s is valid.", providerUniqueId));
return true;
}
- log.log(LogLevel.ERROR, () -> String.format("Instance %s has invalid signature.", providerUniqueId));
+ log.log(Level.SEVERE, () -> String.format("Instance %s has invalid signature.", providerUniqueId));
return false;
}