diff --git a/internal/client_channel.go b/internal/client_channel.go index 5f6aa8f..f80deb1 100644 --- a/internal/client_channel.go +++ b/internal/client_channel.go @@ -83,7 +83,7 @@ func (t *TClient) Channel(ctx context.Context, channel *tg.Channel, cfg *DBChann zap.Int64("size", doc.GetSize()), zap.String("SizeHuman", humanize.Bytes(uint64(doc.GetSize()))), ) - continue + break } data, err := t.saveDocument(ctx, cfg, doc) diff --git a/internal/cmd_export.go b/internal/cmd_export.go index e7edb76..d8ba2d0 100644 --- a/internal/cmd_export.go +++ b/internal/cmd_export.go @@ -2,7 +2,7 @@ package internal import ( "context" - "fmt" + "log" "exporter/config" @@ -22,8 +22,8 @@ func ExportCmd() *cobra.Command { Use: "export", Short: "export channels", PreRunE: func(cmd *cobra.Command, args []string) error { - fmt.Println("init client") - defer fmt.Println("init client done") + log.Println("init client") + defer log.Println("init client done") return InitClient(config.C) }, RunE: wrapE(exportCmd), diff --git a/internal/cmd_login.go b/internal/cmd_login.go index 6b84558..fc98f10 100644 --- a/internal/cmd_login.go +++ b/internal/cmd_login.go @@ -2,7 +2,7 @@ package internal import ( "context" - "fmt" + "log" "exporter/config" @@ -14,8 +14,8 @@ func LoginCmd() *cobra.Command { Use: "login", Short: "login account", PreRunE: func(cmd *cobra.Command, args []string) error { - fmt.Println("init client") - defer fmt.Println("init client done") + log.Println("init client") + defer log.Println("init client done") return InitClient(config.C) }, RunE: wrapE(func(ctx context.Context) error { diff --git a/internal/cmd_watch.go b/internal/cmd_watch.go index e5bba49..f666db4 100644 --- a/internal/cmd_watch.go +++ b/internal/cmd_watch.go @@ -2,7 +2,7 @@ package internal import ( "context" - "fmt" + "log" "time" "exporter/config" @@ -20,8 +20,8 @@ func WatchCmd() *cobra.Command { Use: "watch", Short: "watch channels", PreRunE: func(cmd *cobra.Command, args []string) error { - fmt.Println("init client") - defer fmt.Println("init client done") + log.Println("init client") + defer log.Println("init client done") return InitClient(config.C) }, RunE: wrapE(watchCmd), diff --git a/internal/common.go b/internal/common.go index 3fd8a40..35cdfc9 100644 --- a/internal/common.go +++ b/internal/common.go @@ -2,6 +2,7 @@ package internal import ( "context" + "log" "exporter/config" @@ -49,6 +50,8 @@ func getClient() *TClient { func wrapE(f func(context.Context) error) func(cmd *cobra.Command, args []string) error { return func(cmd *cobra.Command, args []string) error { + log.Println("run client") + defer log.Println("run client done") return getClient().Client.Run(context.Background(), f) } } diff --git a/main.go b/main.go index 0f29a1a..806fba8 100644 --- a/main.go +++ b/main.go @@ -1,7 +1,7 @@ package main import ( - "fmt" + "log" "os" "exporter/config" @@ -18,19 +18,19 @@ func main() { Use: "exporter", Short: "Yet Another Telegram Channel Exporter", PersistentPreRunE: func(cmd *cobra.Command, args []string) error { - fmt.Println("load configs") + log.Println("load configs") if err := config.Load(cfgFile); err != nil { return errors.Wrap(err, "load config") } - fmt.Println("init db") + log.Println("init db") if err := internal.InitDB(config.C.DSN); err != nil { return errors.Wrap(err, "init db") } return nil }, PersistentPostRunE: func(cmd *cobra.Command, args []string) error { - fmt.Println("client exit") + log.Println("client exit") return internal.Close() }, } @@ -45,6 +45,7 @@ func main() { // rootCmd.SilenceErrors = true rootCmd.SilenceUsage = true + rootCmd.SilenceErrors = true rootCmd.SetFlagErrorFunc(func(cmd *cobra.Command, err error) error { cmd.Println(err) cmd.Println(cmd.UsageString()) @@ -53,6 +54,7 @@ func main() { err := rootCmd.Execute() if err != nil { + log.Println(err) os.Exit(1) } }