--log working

Author: clun

astra-shell/src/main/java/com/datastax/astra/shell/AstraCli.java

@@ -85,7 +85,10 @@ public static void main(String[] args) {
         try {
 
             // Enable Colored outputs
-            AnsiConsole.systemInstall();
+            //AnsiConsole.systemInstall();
+            
+            // Save the command line to log it later
+            ShellContext.getInstance().setRawCommand(args);
 
             // Command Line Interface
             new com.github.rvesse.airline.Cli<Runnable>(AstraCli.class)

astra-shell/src/main/java/com/datastax/astra/shell/ShellContext.java

@@ -4,6 +4,7 @@
 import static com.datastax.astra.shell.ExitCode.INVALID_PARAMETER;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 import org.apache.commons.lang3.StringUtils;
@@ -83,6 +84,9 @@ public static synchronized ShellContext getInstance() {
     /** Current shell command (overriding Cli eventually). */
     private BaseShellCommand currentShellCommand;
 
+    /** Raw command. */
+    private List<String> rawCommand = new ArrayList<>();
+    
     /** History of commands in shell. */
     private List<BaseShellCommand> history = new ArrayList<>();
 
@@ -142,19 +146,25 @@ private boolean isSectionTokenValid(BaseCommand cmd) {
      */
     public void init(BaseCliCommand cli) {
         this.startCommand = cli;
+        LoggerShell.info("-----------------------------------------------------");
+        LoggerShell.info("Command : astra " + String.join(" ", ShellContext.getInstance().getRawCommand()));
+        LoggerShell.info("Class   : " + cli.getClass());
         this.token        = cli.getToken();
 
         // No token = use configuration file
         if (this.token == null) {
             // Overriding default config
             if (cli.getConfigFilename() != null) {
+                LoggerShell.trace("ConfigFilename: " + cli.getConfigFilename());
                 this.astraRc = new AstraRc(cli.getConfigFilename());
             } else {
+                LoggerShell.trace("ConfigFilename: " + AstraRc.getDefaultConfigurationFileName());
                 this.astraRc = new AstraRc();
             }
             // Overriding default section
             if (!StringUtils.isEmpty(cli.getConfigSectionName())) {
                 this.configSection = cli.getConfigSectionName();
+                LoggerShell.trace("ConfigSectionName: " + configSection);
             }
 
             if (isSectionValid(cli) && isSectionTokenValid(cli)) {
@@ -378,5 +388,25 @@ public void setCurrentShellCommand(BaseShellCommand currentShellCommand) {
     public List<BaseShellCommand> getHistory() {
         return history;
     }
+
+    /**
+     * Getter accessor for attribute 'rawCommand'.
+     *
+     * @return
+     *       current value of 'rawCommand'
+     */
+    public List<String> getRawCommand() {
+        return rawCommand;
+    }
+
+    /**
+     * Setter accessor for attribute 'rawCommand'.
+     *
+     * @param args
+     * 		input arguments for the command.
+     */
+    public void setRawCommand(String... args) {
+        this.rawCommand = Arrays.asList(args);
+    }
 
 }

astra-shell/src/main/java/com/datastax/astra/shell/cmd/BaseCliCommand.java

@@ -8,7 +8,6 @@
 import com.datastax.astra.sdk.utils.AstraRc;
 import com.datastax.astra.shell.ExitCode;
 import com.datastax.astra.shell.ShellContext;
-import com.datastax.astra.shell.utils.LoggerShell;
 import com.github.rvesse.airline.annotations.Option;
 
 /**
@@ -72,16 +71,11 @@ private void initLogFile() {
     @Override
     public void run() {
         // Initialization of Logger
-        initLogFile();
-       
+       initLogFile();
+        
        // Initialization of context
        ShellContext.getInstance().init(this);
 
-       LoggerShell.trace("Command " + getClass().getName());
-       LoggerShell.trace("Token: " + token);
-       LoggerShell.trace("ConfigFilename: " + configFilename);
-       LoggerShell.trace("ConfigSectionName: " + configSectionName);
-       
        // Execute command and exit program
        execute().exit();
     }

astra-shell/src/main/java/com/datastax/astra/shell/utils/LoggerShell.java

@@ -53,6 +53,7 @@ private static void logToFile(String level, String text) {
                         + " - " 
                         + StringUtils.rightPad(level, 5) 
                         + " - " + text + System.lineSeparator());
+                cli.getLogFileWriter().flush();
             } catch (IOException e) {
                 System.out.println("Writes in log file failed: " + e.getMessage());
             }
@@ -112,7 +113,7 @@ public static void warning(String text) {
      */
     public static void trace(String text) {
         if (isVerbose()) {
-            System.out.println(ansi().fg(YELLOW).a("[DEBUG ] - ").reset().a(text));
+            System.out.println(ansi().fg(YELLOW).a("[DEBUG] - ").reset().a(text));
         }
         logToFile("DEBUG", text);
     }

astra-shell/src/test/java/com/datastax/astra/RolesCommandsTest.java

@@ -17,7 +17,7 @@ public void interactive()  throws Exception {
 
     @Test
     public void listRoles()  throws Exception {
-        astraCli("role", "list", "--verbose" /*, "-f", "csv"*/);
+        astraCli("role", "list", /*"-f", "csv" ,  "--verbose",*/ "--log", "/Users/cedricklunven/Downloads/log2.txt");
     }
 
     @Test