Fix logging levels

vault/expiration.go

@@ -174,7 +174,7 @@ func (m *ExpirationManager) Tidy() error {
 		}
 
 		if revokeLease {
-			m.logger.Debug("expiration: lease is being revoked", "lease_id", leaseID)
+			m.logger.Debug("expiration: invalid lease is being revoked", "lease_id", leaseID)
 			// Force the revocation and skip going through the token store
 			// again
 			err = m.revokeCommon(leaseID, true, true)

vault/token_store.go

@@ -1148,7 +1148,7 @@ func (ts *TokenStore) handleTidy(req *logical.Request, data *framework.FieldData
 	// a valid one. If not, delete the leases associated with that token
 	// and delete the accessor as well.
 	for _, saltedAccessor := range saltedAccessorList {
-		ts.logger.Trace("token_store: checking if salted accessor is valid", "salted_accessor", saltedAccessor)
+		ts.logger.Trace("token_store: checking if accessor contains valid token", "salted_accessor", saltedAccessor)
 		accessorEntry, err := ts.lookupBySaltedAccessor(saltedAccessor)
 		if err != nil {
 			tidyErrors = multierror.Append(tidyErrors, fmt.Errorf("failed to read the accessor entry: %v", err))
@@ -1159,7 +1159,7 @@ func (ts *TokenStore) handleTidy(req *logical.Request, data *framework.FieldData
 		// in it. If not, it is an invalid accessor entry and needs to
 		// be deleted.
 		if accessorEntry.TokenID == "" {
-			ts.logger.Trace("token_store: deleting accessor with invalid token ID", "salted_accessor", saltedAccessor)
+			ts.logger.Debug("token_store: deleting accessor with invalid token ID", "salted_accessor", saltedAccessor)
 			// If deletion of accessor fails, move on to the next
 			// item since this is just a best-effort operation
 			err = ts.view.Delete(accessorPrefix + saltedAccessor)
@@ -1182,7 +1182,7 @@ func (ts *TokenStore) handleTidy(req *logical.Request, data *framework.FieldData
 		// more and conclude that accessor, leases, and secondary index entries
 		// for this token should not exist as well.
 		if te == nil {
-			ts.logger.Trace("token_store: deleting token with nil entry", "salted_token", saltedId)
+			ts.logger.Debug("token_store: deleting token with nil entry", "salted_token", saltedId)
 			// RevokeByToken expects a '*TokenEntry'. For the
 			// purposes of tidying, it is sufficient if the token
 			// entry only has ID set.
@@ -1198,7 +1198,7 @@ func (ts *TokenStore) handleTidy(req *logical.Request, data *framework.FieldData
 				continue
 			}
 
-			ts.logger.Trace("token_store: deleting accessor of the token with nil entry", "salted_accessor", saltedAccessor)
+			ts.logger.Debug("token_store: deleting accessor of the token with nil entry", "salted_accessor", saltedAccessor)
 			// If deletion of accessor fails, move on to the next item since
 			// this is just a best-effort operation. We do this last so that on
 			// next run if something above failed we still have the accessor