Make logs better

Author: mugli

kill-mysql-query.go

@@ -60,12 +60,7 @@ func killQueries(config configuration.Config) {
 		}
 
 		showKillPrompt(longQueries, dbConn, config)
-		fmt.Println()
-		fmt.Println()
-		fmt.Println()
-		fmt.Println("-----------------------------------")
 		fmt.Println("💫	Rechecking...")
-		fmt.Println("-----------------------------------")
 	}
 }
 
@@ -129,13 +124,16 @@ func showKillPrompt(longQueries []mysql.MysqlProcess, dbConn *sqlx.DB, config co
 		os.Exit(0)
 	}
 
-	if len(longQueries) == 1 {
-		query := longQueries[0]
-		cyan := color.FgCyan.Render
-		label := fmt.Sprintf("🐢	This query is running for %s second(s) in `%s` database:\n\n%s\n\n", cyan(query.Time), cyan(query.DB), cyan(query.Info.String))
+	cyan := color.FgCyan.Render
+	green := color.FgGreen.Render
 
+	if len(longQueries) == 1 {
 		fmt.Println()
 		fmt.Println()
+		fmt.Printf("❄️	Found %s long running query!\n", cyan("1"))
+		query := longQueries[0]
+		label := fmt.Sprintf("🐢	This query is running for %s second(s) in the `%s` database:\n\n%s\n\n", cyan(query.Time), cyan(query.DB), cyan(query.TruncatedQuery))
+
 		fmt.Println(label)
 		prompt := promptui.Prompt{
 			Label:     "🧨  Kill it?",
@@ -159,6 +157,11 @@ func showKillPrompt(longQueries []mysql.MysqlProcess, dbConn *sqlx.DB, config co
 	}
 
 	if len(longQueries) > 1 {
+		fmt.Println()
+		fmt.Println()
+		fmt.Printf("❄️	Found %s long running queries!\n", cyan(len(longQueries)))
+		fmt.Println()
+
 		templates := &promptui.SelectTemplates{
 			Label: "{{ . }}?",
 			Active: "👉	DB `{{ .DB | cyan }}`,	Running Time: {{ .Time | cyan }}s,	Query: {{ .TruncatedQuery | cyan }}",
@@ -174,15 +177,14 @@ func showKillPrompt(longQueries []mysql.MysqlProcess, dbConn *sqlx.DB, config co
 {{ "Query:" | faint }}	{{ .TruncatedQuery }}`,
 		}
 
+		label := fmt.Sprintf("Press %s to confirm. Which one to kill?", green("ENTER"))
 		prompt := promptui.Select{
-			Label:     "Press enter to select. Which one to kill?",
+			Label:     label,
 			Items:     longQueries,
 			Templates: templates,
 			Size:      10,
 		}
 
-		fmt.Println()
-		fmt.Println()
 		i, _, err := prompt.Run()
 
 		if err != nil {

mysql/query.go

@@ -7,6 +7,7 @@ import (
 	"regexp"
 	"text/template"
 
+	"github.com/gookit/color"
 	"github.com/mugli/go-kill-mysql-query/configuration"
 
 	"github.com/jmoiron/sqlx"
@@ -104,7 +105,7 @@ func truncateString(str string, num int) string {
 }
 
 func GetLongRunningQueries(dbConn *sqlx.DB, config configuration.Config) ([]MysqlProcess, error) {
-	fmt.Println("🕴	Looking for slow queries...")
+	fmt.Println("🕴	Looking for long running queries...")
 
 	longQueries := make([]MysqlProcess, 0)
 	query, err := generateQuery(config)
@@ -130,12 +131,14 @@ func GetLongRunningQueries(dbConn *sqlx.DB, config configuration.Config) ([]Mysq
 }
 
 func KillMySQLProcess(killCommand string, dbConn *sqlx.DB) error {
+	fmt.Println()
 	fmt.Println("☠️	Sending kill command...")
 
 	if _, err := dbConn.Queryx(killCommand); err != nil {
 		return err
 	}
 
-	fmt.Println("☠️	Killed it!")
+	green := color.FgGreen.Render
+	fmt.Println("☠️	" + green("Killed it!"))
 	return nil
 }