smiklosovic commented on a change in pull request #1051:
URL: https://github.com/apache/cassandra/pull/1051#discussion_r690676106
##########
File path: src/java/org/apache/cassandra/service/StorageService.java
##########
@@ -5786,38 +5786,53 @@ public void disableAuditLog()
logger.info("Auditlog is disabled");
}
+ @Deprecated
public void enableAuditLog(String loggerName, String includedKeyspaces,
String excludedKeyspaces, String includedCategories, String excludedCategories,
String includedUsers, String excludedUsers)
throws ConfigurationException, IllegalStateException
{
- enableAuditLog(loggerName, Collections.emptyMap(), includedKeyspaces,
excludedKeyspaces, includedCategories, excludedCategories, includedUsers,
excludedUsers);
+ enableAuditLog(loggerName, Collections.emptyMap(), includedKeyspaces,
excludedKeyspaces, includedCategories, excludedCategories, includedUsers,
excludedUsers,
+ Integer.MIN_VALUE, null, null, Long.MIN_VALUE,
Integer.MIN_VALUE, null);
+ }
+
+ public void enableAuditLog(String loggerName, String includedKeyspaces,
String excludedKeyspaces, String includedCategories, String excludedCategories,
+ String includedUsers, String excludedUsers,
Integer maxArchiveRetries, Boolean block, String rollCycle,
+ Long maxLogSize, Integer maxQueueWeight, String
archiveCommand) throws ConfigurationException, IllegalStateException
+ {
+ enableAuditLog(loggerName, Collections.emptyMap(), includedKeyspaces,
excludedKeyspaces, includedCategories, excludedCategories, includedUsers,
excludedUsers,
+ maxArchiveRetries, block, rollCycle, maxLogSize,
maxQueueWeight, archiveCommand);
}
+ @Deprecated
public void enableAuditLog(String loggerName, Map<String, String>
parameters, String includedKeyspaces, String excludedKeyspaces, String
includedCategories, String excludedCategories,
Review comment:
that one does not accept Map, for tooling like JConsole, there is not
any way how to invoke a method if it accepts Map, it is not invokable there.
##########
File path: src/java/org/apache/cassandra/service/StorageService.java
##########
@@ -5786,38 +5786,53 @@ public void disableAuditLog()
logger.info("Auditlog is disabled");
}
+ @Deprecated
public void enableAuditLog(String loggerName, String includedKeyspaces,
String excludedKeyspaces, String includedCategories, String excludedCategories,
String includedUsers, String excludedUsers)
throws ConfigurationException, IllegalStateException
{
- enableAuditLog(loggerName, Collections.emptyMap(), includedKeyspaces,
excludedKeyspaces, includedCategories, excludedCategories, includedUsers,
excludedUsers);
+ enableAuditLog(loggerName, Collections.emptyMap(), includedKeyspaces,
excludedKeyspaces, includedCategories, excludedCategories, includedUsers,
excludedUsers,
+ Integer.MIN_VALUE, null, null, Long.MIN_VALUE,
Integer.MIN_VALUE, null);
+ }
+
+ public void enableAuditLog(String loggerName, String includedKeyspaces,
String excludedKeyspaces, String includedCategories, String excludedCategories,
+ String includedUsers, String excludedUsers,
Integer maxArchiveRetries, Boolean block, String rollCycle,
+ Long maxLogSize, Integer maxQueueWeight, String
archiveCommand) throws ConfigurationException, IllegalStateException
+ {
+ enableAuditLog(loggerName, Collections.emptyMap(), includedKeyspaces,
excludedKeyspaces, includedCategories, excludedCategories, includedUsers,
excludedUsers,
+ maxArchiveRetries, block, rollCycle, maxLogSize,
maxQueueWeight, archiveCommand);
}
+ @Deprecated
public void enableAuditLog(String loggerName, Map<String, String>
parameters, String includedKeyspaces, String excludedKeyspaces, String
includedCategories, String excludedCategories,
Review comment:
People tend to use tooling different from nodetool and they are not call
that programmatically either, if there is just one method accepting paramter
like Map, we just make it incallable in that tooling. JConsole, for example,
are used quite heavily with our devops and they are more often in JConsole than
nodetool (some of them) so I just do not cut the off completely here.
I know we might now try to figure out some workaround or similar but that
would end up being even more awkward and custom and that is not the problem I
want to address in this ticket.
Methods in interfaces are very inconsistent and they lack a robust and
coherent approach and us spending any more time on this is rather quesionable,
when it comes to this ticket itself and what we try to achieve.
##########
File path: src/java/org/apache/cassandra/service/StorageService.java
##########
@@ -5786,38 +5786,53 @@ public void disableAuditLog()
logger.info("Auditlog is disabled");
}
+ @Deprecated
public void enableAuditLog(String loggerName, String includedKeyspaces,
String excludedKeyspaces, String includedCategories, String excludedCategories,
String includedUsers, String excludedUsers)
throws ConfigurationException, IllegalStateException
{
- enableAuditLog(loggerName, Collections.emptyMap(), includedKeyspaces,
excludedKeyspaces, includedCategories, excludedCategories, includedUsers,
excludedUsers);
+ enableAuditLog(loggerName, Collections.emptyMap(), includedKeyspaces,
excludedKeyspaces, includedCategories, excludedCategories, includedUsers,
excludedUsers,
+ Integer.MIN_VALUE, null, null, Long.MIN_VALUE,
Integer.MIN_VALUE, null);
+ }
+
+ public void enableAuditLog(String loggerName, String includedKeyspaces,
String excludedKeyspaces, String includedCategories, String excludedCategories,
+ String includedUsers, String excludedUsers,
Integer maxArchiveRetries, Boolean block, String rollCycle,
+ Long maxLogSize, Integer maxQueueWeight, String
archiveCommand) throws ConfigurationException, IllegalStateException
+ {
+ enableAuditLog(loggerName, Collections.emptyMap(), includedKeyspaces,
excludedKeyspaces, includedCategories, excludedCategories, includedUsers,
excludedUsers,
+ maxArchiveRetries, block, rollCycle, maxLogSize,
maxQueueWeight, archiveCommand);
}
+ @Deprecated
public void enableAuditLog(String loggerName, Map<String, String>
parameters, String includedKeyspaces, String excludedKeyspaces, String
includedCategories, String excludedCategories,
Review comment:
People tend to use tooling different from nodetool and they are not
calling that programmatically either, if there is just one method accepting
paramter like Map, we just make it incallable in that tooling. JConsole, for
example, is used quite heavily by our devops and they are more often in
JConsole than nodetool (some of them) so I just do not want to cut them off
completely here.
I know we might now try to figure out some workaround or similar but that
would end up being even more awkward and custom and that is not the problem I
want to address in this ticket.
Methods in interfaces are very inconsistent and they lack a robust and
coherent approach and us spending any more time on this is rather quesionable
... when it comes to this ticket itself and what we try to achieve.
##########
File path: src/java/org/apache/cassandra/service/StorageService.java
##########
@@ -5786,38 +5786,53 @@ public void disableAuditLog()
logger.info("Auditlog is disabled");
}
+ @Deprecated
public void enableAuditLog(String loggerName, String includedKeyspaces,
String excludedKeyspaces, String includedCategories, String excludedCategories,
String includedUsers, String excludedUsers)
throws ConfigurationException, IllegalStateException
{
- enableAuditLog(loggerName, Collections.emptyMap(), includedKeyspaces,
excludedKeyspaces, includedCategories, excludedCategories, includedUsers,
excludedUsers);
+ enableAuditLog(loggerName, Collections.emptyMap(), includedKeyspaces,
excludedKeyspaces, includedCategories, excludedCategories, includedUsers,
excludedUsers,
+ Integer.MIN_VALUE, null, null, Long.MIN_VALUE,
Integer.MIN_VALUE, null);
+ }
+
+ public void enableAuditLog(String loggerName, String includedKeyspaces,
String excludedKeyspaces, String includedCategories, String excludedCategories,
+ String includedUsers, String excludedUsers,
Integer maxArchiveRetries, Boolean block, String rollCycle,
+ Long maxLogSize, Integer maxQueueWeight, String
archiveCommand) throws ConfigurationException, IllegalStateException
+ {
+ enableAuditLog(loggerName, Collections.emptyMap(), includedKeyspaces,
excludedKeyspaces, includedCategories, excludedCategories, includedUsers,
excludedUsers,
+ maxArchiveRetries, block, rollCycle, maxLogSize,
maxQueueWeight, archiveCommand);
}
+ @Deprecated
public void enableAuditLog(String loggerName, Map<String, String>
parameters, String includedKeyspaces, String excludedKeyspaces, String
includedCategories, String excludedCategories,
Review comment:
This specific method was deprecated because it does not contain all
other parameters we enabled to be specified. The longer version is used instead.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
