From 146ab299d020bffe85641084e383847dc33fcc44 Mon Sep 17 00:00:00 2001 From: teru Date: Tue, 25 Jul 2017 11:57:30 +0900 Subject: [PATCH] Use Errorf --- cmd/mailfull/cmd_aliasdomainadd.go | 10 +++++----- cmd/mailfull/cmd_aliasdomaindel.go | 8 ++++---- cmd/mailfull/cmd_aliasdomains.go | 4 ++-- cmd/mailfull/cmd_aliasuseradd.go | 10 +++++----- cmd/mailfull/cmd_aliasuserdel.go | 8 ++++---- cmd/mailfull/cmd_aliasusermod.go | 14 +++++++------- cmd/mailfull/cmd_aliasusers.go | 4 ++-- cmd/mailfull/cmd_catchall.go | 4 ++-- cmd/mailfull/cmd_catchallset.go | 10 +++++----- cmd/mailfull/cmd_catchallunset.go | 8 ++++---- cmd/mailfull/cmd_commit.go | 6 +++--- cmd/mailfull/cmd_domainadd.go | 14 +++++++------- cmd/mailfull/cmd_domaindel.go | 8 ++++---- cmd/mailfull/cmd_domaindisable.go | 12 ++++++------ cmd/mailfull/cmd_domainenable.go | 12 ++++++------ cmd/mailfull/cmd_domains.go | 4 ++-- cmd/mailfull/cmd_genconfig.go | 4 ++-- cmd/mailfull/cmd_init.go | 2 +- cmd/mailfull/cmd_useradd.go | 10 +++++----- cmd/mailfull/cmd_usercheckpw.go | 8 ++++---- cmd/mailfull/cmd_userdel.go | 10 +++++----- cmd/mailfull/cmd_userpasswd.go | 20 ++++++++++---------- cmd/mailfull/cmd_users.go | 4 ++-- 23 files changed, 97 insertions(+), 97 deletions(-) diff --git a/cmd/mailfull/cmd_aliasdomainadd.go b/cmd/mailfull/cmd_aliasdomainadd.go index 8f567d6..1e68ad8 100644 --- a/cmd/mailfull/cmd_aliasdomainadd.go +++ b/cmd/mailfull/cmd_aliasdomainadd.go @@ -60,18 +60,18 @@ func (c *CmdAliasDomainAdd) Run(args []string) int { repo, err := mailfull.OpenRepository(".") if err != nil { - fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) + c.Meta.Errorf("%v\n", err) return 1 } aliasDomain, err := mailfull.NewAliasDomain(aliasDomainName, targetDomainName) if err != nil { - fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) + c.Meta.Errorf("%v\n", err) return 1 } if err := repo.AliasDomainCreate(aliasDomain); err != nil { - fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) + c.Meta.Errorf("%v\n", err) return 1 } @@ -81,13 +81,13 @@ func (c *CmdAliasDomainAdd) Run(args []string) int { mailData, err := repo.MailData() if err != nil { - fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) + c.Meta.Errorf("%v\n", err) return 1 } err = repo.GenerateDatabases(mailData) if err != nil { - fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) + c.Meta.Errorf("%v\n", err) return 1 } diff --git a/cmd/mailfull/cmd_aliasdomaindel.go b/cmd/mailfull/cmd_aliasdomaindel.go index 1cd408b..aab3df5 100644 --- a/cmd/mailfull/cmd_aliasdomaindel.go +++ b/cmd/mailfull/cmd_aliasdomaindel.go @@ -57,12 +57,12 @@ func (c *CmdAliasDomainDel) Run(args []string) int { repo, err := mailfull.OpenRepository(".") if err != nil { - fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) + c.Meta.Errorf("%v\n", err) return 1 } if err := repo.AliasDomainRemove(aliasDomainName); err != nil { - fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) + c.Meta.Errorf("%v\n", err) return 1 } @@ -72,13 +72,13 @@ func (c *CmdAliasDomainDel) Run(args []string) int { mailData, err := repo.MailData() if err != nil { - fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) + c.Meta.Errorf("%v\n", err) return 1 } err = repo.GenerateDatabases(mailData) if err != nil { - fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) + c.Meta.Errorf("%v\n", err) return 1 } diff --git a/cmd/mailfull/cmd_aliasdomains.go b/cmd/mailfull/cmd_aliasdomains.go index 8c3cdd7..0a8bf2c 100644 --- a/cmd/mailfull/cmd_aliasdomains.go +++ b/cmd/mailfull/cmd_aliasdomains.go @@ -51,13 +51,13 @@ func (c *CmdAliasDomains) Run(args []string) int { repo, err := mailfull.OpenRepository(".") if err != nil { - fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) + c.Meta.Errorf("%v\n", err) return 1 } aliasDomains, err := repo.AliasDomains() if err != nil { - fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) + c.Meta.Errorf("%v\n", err) return 1 } sort.Sort(mailfull.AliasDomainSlice(aliasDomains)) diff --git a/cmd/mailfull/cmd_aliasuseradd.go b/cmd/mailfull/cmd_aliasuseradd.go index 1fbde7a..8760eb6 100644 --- a/cmd/mailfull/cmd_aliasuseradd.go +++ b/cmd/mailfull/cmd_aliasuseradd.go @@ -69,18 +69,18 @@ func (c *CmdAliasUserAdd) Run(args []string) int { repo, err := mailfull.OpenRepository(".") if err != nil { - fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) + c.Meta.Errorf("%v\n", err) return 1 } aliasUser, err := mailfull.NewAliasUser(aliasUserName, targets) if err != nil { - fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) + c.Meta.Errorf("%v\n", err) return 1 } if err := repo.AliasUserCreate(domainName, aliasUser); err != nil { - fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) + c.Meta.Errorf("%v\n", err) return 1 } @@ -90,13 +90,13 @@ func (c *CmdAliasUserAdd) Run(args []string) int { mailData, err := repo.MailData() if err != nil { - fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) + c.Meta.Errorf("%v\n", err) return 1 } err = repo.GenerateDatabases(mailData) if err != nil { - fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) + c.Meta.Errorf("%v\n", err) return 1 } diff --git a/cmd/mailfull/cmd_aliasuserdel.go b/cmd/mailfull/cmd_aliasuserdel.go index e16e7d6..6c86072 100644 --- a/cmd/mailfull/cmd_aliasuserdel.go +++ b/cmd/mailfull/cmd_aliasuserdel.go @@ -65,12 +65,12 @@ func (c *CmdAliasUserDel) Run(args []string) int { repo, err := mailfull.OpenRepository(".") if err != nil { - fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) + c.Meta.Errorf("%v\n", err) return 1 } if err := repo.AliasUserRemove(domainName, aliasUserName); err != nil { - fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) + c.Meta.Errorf("%v\n", err) return 1 } @@ -80,13 +80,13 @@ func (c *CmdAliasUserDel) Run(args []string) int { mailData, err := repo.MailData() if err != nil { - fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) + c.Meta.Errorf("%v\n", err) return 1 } err = repo.GenerateDatabases(mailData) if err != nil { - fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) + c.Meta.Errorf("%v\n", err) return 1 } diff --git a/cmd/mailfull/cmd_aliasusermod.go b/cmd/mailfull/cmd_aliasusermod.go index adeab62..213b683 100644 --- a/cmd/mailfull/cmd_aliasusermod.go +++ b/cmd/mailfull/cmd_aliasusermod.go @@ -69,27 +69,27 @@ func (c *CmdAliasUserMod) Run(args []string) int { repo, err := mailfull.OpenRepository(".") if err != nil { - fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) + c.Meta.Errorf("%v\n", err) return 1 } aliasUser, err := repo.AliasUser(domainName, aliasUserName) if err != nil { - fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) + c.Meta.Errorf("%v\n", err) return 1 } if aliasUser == nil { - fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", mailfull.ErrAliasUserNotExist) + c.Meta.Errorf("%v\n", mailfull.ErrAliasUserNotExist) return 1 } if err := aliasUser.SetTargets(targets); err != nil { - fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) + c.Meta.Errorf("%v\n", err) return 1 } if err := repo.AliasUserUpdate(domainName, aliasUser); err != nil { - fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) + c.Meta.Errorf("%v\n", err) return 1 } @@ -99,13 +99,13 @@ func (c *CmdAliasUserMod) Run(args []string) int { mailData, err := repo.MailData() if err != nil { - fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) + c.Meta.Errorf("%v\n", err) return 1 } err = repo.GenerateDatabases(mailData) if err != nil { - fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) + c.Meta.Errorf("%v\n", err) return 1 } diff --git a/cmd/mailfull/cmd_aliasusers.go b/cmd/mailfull/cmd_aliasusers.go index e0d60c9..4469f09 100644 --- a/cmd/mailfull/cmd_aliasusers.go +++ b/cmd/mailfull/cmd_aliasusers.go @@ -48,13 +48,13 @@ func (c *CmdAliasUsers) Run(args []string) int { repo, err := mailfull.OpenRepository(".") if err != nil { - fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) + c.Meta.Errorf("%v\n", err) return 1 } aliasUsers, err := repo.AliasUsers(targetDomainName) if err != nil { - fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) + c.Meta.Errorf("%v\n", err) return 1 } sort.Sort(mailfull.AliasUserSlice(aliasUsers)) diff --git a/cmd/mailfull/cmd_catchall.go b/cmd/mailfull/cmd_catchall.go index 974fc7b..43615a3 100644 --- a/cmd/mailfull/cmd_catchall.go +++ b/cmd/mailfull/cmd_catchall.go @@ -47,13 +47,13 @@ func (c *CmdCatchAll) Run(args []string) int { repo, err := mailfull.OpenRepository(".") if err != nil { - fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) + c.Meta.Errorf("%v\n", err) return 1 } catchAllUser, err := repo.CatchAllUser(domainName) if err != nil { - fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) + c.Meta.Errorf("%v\n", err) return 1 } diff --git a/cmd/mailfull/cmd_catchallset.go b/cmd/mailfull/cmd_catchallset.go index f89fc2c..762a1b1 100644 --- a/cmd/mailfull/cmd_catchallset.go +++ b/cmd/mailfull/cmd_catchallset.go @@ -60,18 +60,18 @@ func (c *CmdCatchAllSet) Run(args []string) int { repo, err := mailfull.OpenRepository(".") if err != nil { - fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) + c.Meta.Errorf("%v\n", err) return 1 } catchAllUser, err := mailfull.NewCatchAllUser(userName) if err != nil { - fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) + c.Meta.Errorf("%v\n", err) return 1 } if err := repo.CatchAllUserSet(domainName, catchAllUser); err != nil { - fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) + c.Meta.Errorf("%v\n", err) return 1 } @@ -81,13 +81,13 @@ func (c *CmdCatchAllSet) Run(args []string) int { mailData, err := repo.MailData() if err != nil { - fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) + c.Meta.Errorf("%v\n", err) return 1 } err = repo.GenerateDatabases(mailData) if err != nil { - fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) + c.Meta.Errorf("%v\n", err) return 1 } diff --git a/cmd/mailfull/cmd_catchallunset.go b/cmd/mailfull/cmd_catchallunset.go index 7f2d204..8806a06 100644 --- a/cmd/mailfull/cmd_catchallunset.go +++ b/cmd/mailfull/cmd_catchallunset.go @@ -57,12 +57,12 @@ func (c *CmdCatchAllUnset) Run(args []string) int { repo, err := mailfull.OpenRepository(".") if err != nil { - fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) + c.Meta.Errorf("%v\n", err) return 1 } if err := repo.CatchAllUserUnset(domainName); err != nil { - fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) + c.Meta.Errorf("%v\n", err) return 1 } @@ -72,13 +72,13 @@ func (c *CmdCatchAllUnset) Run(args []string) int { mailData, err := repo.MailData() if err != nil { - fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) + c.Meta.Errorf("%v\n", err) return 1 } err = repo.GenerateDatabases(mailData) if err != nil { - fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) + c.Meta.Errorf("%v\n", err) return 1 } diff --git a/cmd/mailfull/cmd_commit.go b/cmd/mailfull/cmd_commit.go index 9ed6f20..98276ef 100644 --- a/cmd/mailfull/cmd_commit.go +++ b/cmd/mailfull/cmd_commit.go @@ -36,19 +36,19 @@ Description: func (c *CmdCommit) Run(args []string) int { repo, err := mailfull.OpenRepository(".") if err != nil { - fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) + c.Meta.Errorf("%v\n", err) return 1 } mailData, err := repo.MailData() if err != nil { - fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) + c.Meta.Errorf("%v\n", err) return 1 } err = repo.GenerateDatabases(mailData) if err != nil { - fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) + c.Meta.Errorf("%v\n", err) return 1 } diff --git a/cmd/mailfull/cmd_domainadd.go b/cmd/mailfull/cmd_domainadd.go index 86dd129..e7680d3 100644 --- a/cmd/mailfull/cmd_domainadd.go +++ b/cmd/mailfull/cmd_domainadd.go @@ -57,29 +57,29 @@ func (c *CmdDomainAdd) Run(args []string) int { repo, err := mailfull.OpenRepository(".") if err != nil { - fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) + c.Meta.Errorf("%v\n", err) return 1 } domain, err := mailfull.NewDomain(domainName) if err != nil { - fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) + c.Meta.Errorf("%v\n", err) return 1 } if err := repo.DomainCreate(domain); err != nil { - fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) + c.Meta.Errorf("%v\n", err) return 1 } user, err := mailfull.NewUser("postmaster", mailfull.NeverMatchHashedPassword, nil) if err != nil { - fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) + c.Meta.Errorf("%v\n", err) return 1 } if err := repo.UserCreate(domainName, user); err != nil { - fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) + c.Meta.Errorf("%v\n", err) return 1 } @@ -89,13 +89,13 @@ func (c *CmdDomainAdd) Run(args []string) int { mailData, err := repo.MailData() if err != nil { - fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) + c.Meta.Errorf("%v\n", err) return 1 } err = repo.GenerateDatabases(mailData) if err != nil { - fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) + c.Meta.Errorf("%v\n", err) return 1 } diff --git a/cmd/mailfull/cmd_domaindel.go b/cmd/mailfull/cmd_domaindel.go index f546ebc..f521a26 100644 --- a/cmd/mailfull/cmd_domaindel.go +++ b/cmd/mailfull/cmd_domaindel.go @@ -57,12 +57,12 @@ func (c *CmdDomainDel) Run(args []string) int { repo, err := mailfull.OpenRepository(".") if err != nil { - fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) + c.Meta.Errorf("%v\n", err) return 1 } if err := repo.DomainRemove(domainName); err != nil { - fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) + c.Meta.Errorf("%v\n", err) return 1 } @@ -72,13 +72,13 @@ func (c *CmdDomainDel) Run(args []string) int { mailData, err := repo.MailData() if err != nil { - fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) + c.Meta.Errorf("%v\n", err) return 1 } err = repo.GenerateDatabases(mailData) if err != nil { - fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) + c.Meta.Errorf("%v\n", err) return 1 } diff --git a/cmd/mailfull/cmd_domaindisable.go b/cmd/mailfull/cmd_domaindisable.go index c30fb69..3a884b5 100644 --- a/cmd/mailfull/cmd_domaindisable.go +++ b/cmd/mailfull/cmd_domaindisable.go @@ -57,24 +57,24 @@ func (c *CmdDomainDisable) Run(args []string) int { repo, err := mailfull.OpenRepository(".") if err != nil { - fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) + c.Meta.Errorf("%v\n", err) return 1 } domain, err := repo.Domain(domainName) if err != nil { - fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) + c.Meta.Errorf("%v\n", err) return 1 } if domain == nil { - fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", mailfull.ErrDomainNotExist) + c.Meta.Errorf("%v\n", mailfull.ErrDomainNotExist) return 1 } domain.SetDisabled(true) if err := repo.DomainUpdate(domain); err != nil { - fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) + c.Meta.Errorf("%v\n", err) return 1 } @@ -84,13 +84,13 @@ func (c *CmdDomainDisable) Run(args []string) int { mailData, err := repo.MailData() if err != nil { - fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) + c.Meta.Errorf("%v\n", err) return 1 } err = repo.GenerateDatabases(mailData) if err != nil { - fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) + c.Meta.Errorf("%v\n", err) return 1 } diff --git a/cmd/mailfull/cmd_domainenable.go b/cmd/mailfull/cmd_domainenable.go index 55ab058..d185906 100644 --- a/cmd/mailfull/cmd_domainenable.go +++ b/cmd/mailfull/cmd_domainenable.go @@ -57,24 +57,24 @@ func (c *CmdDomainEnable) Run(args []string) int { repo, err := mailfull.OpenRepository(".") if err != nil { - fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) + c.Meta.Errorf("%v\n", err) return 1 } domain, err := repo.Domain(domainName) if err != nil { - fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) + c.Meta.Errorf("%v\n", err) return 1 } if domain == nil { - fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", mailfull.ErrDomainNotExist) + c.Meta.Errorf("%v\n", mailfull.ErrDomainNotExist) return 1 } domain.SetDisabled(false) if err := repo.DomainUpdate(domain); err != nil { - fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) + c.Meta.Errorf("%v\n", err) return 1 } @@ -84,13 +84,13 @@ func (c *CmdDomainEnable) Run(args []string) int { mailData, err := repo.MailData() if err != nil { - fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) + c.Meta.Errorf("%v\n", err) return 1 } err = repo.GenerateDatabases(mailData) if err != nil { - fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) + c.Meta.Errorf("%v\n", err) return 1 } diff --git a/cmd/mailfull/cmd_domains.go b/cmd/mailfull/cmd_domains.go index 22a761e..bc215f2 100644 --- a/cmd/mailfull/cmd_domains.go +++ b/cmd/mailfull/cmd_domains.go @@ -38,13 +38,13 @@ Description: func (c *CmdDomains) Run(args []string) int { repo, err := mailfull.OpenRepository(".") if err != nil { - fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) + c.Meta.Errorf("%v\n", err) return 1 } domains, err := repo.Domains() if err != nil { - fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) + c.Meta.Errorf("%v\n", err) return 1 } sort.Sort(mailfull.DomainSlice(domains)) diff --git a/cmd/mailfull/cmd_genconfig.go b/cmd/mailfull/cmd_genconfig.go index 3dedc0e..5cf4dd8 100644 --- a/cmd/mailfull/cmd_genconfig.go +++ b/cmd/mailfull/cmd_genconfig.go @@ -48,7 +48,7 @@ func (c *CmdGenConfig) Run(args []string) int { repo, err := mailfull.OpenRepository(".") if err != nil { - fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) + c.Meta.Errorf("%v\n", err) return 1 } @@ -60,7 +60,7 @@ func (c *CmdGenConfig) Run(args []string) int { fmt.Fprintf(c.UI.Writer, "%s", repo.GenerateConfigDovecot()) default: - fmt.Fprintf(c.UI.ErrorWriter, "[ERR] Specify \"postfix\" or \"dovecot\".\n") + c.Meta.Errorf("Specify \"postfix\" or \"dovecot\".\n") return 1 } diff --git a/cmd/mailfull/cmd_init.go b/cmd/mailfull/cmd_init.go index 9640b61..922e30d 100644 --- a/cmd/mailfull/cmd_init.go +++ b/cmd/mailfull/cmd_init.go @@ -35,7 +35,7 @@ Description: // Run runs the command and returns the exit status. func (c *CmdInit) Run(args []string) int { if err := mailfull.InitRepository("."); err != nil { - fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) + c.Meta.Errorf("%v\n", err) return 1 } diff --git a/cmd/mailfull/cmd_useradd.go b/cmd/mailfull/cmd_useradd.go index ad268b6..b6695ab 100644 --- a/cmd/mailfull/cmd_useradd.go +++ b/cmd/mailfull/cmd_useradd.go @@ -66,18 +66,18 @@ func (c *CmdUserAdd) Run(args []string) int { repo, err := mailfull.OpenRepository(".") if err != nil { - fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) + c.Meta.Errorf("%v\n", err) return 1 } user, err := mailfull.NewUser(userName, mailfull.NeverMatchHashedPassword, nil) if err != nil { - fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) + c.Meta.Errorf("%v\n", err) return 1 } if err := repo.UserCreate(domainName, user); err != nil { - fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) + c.Meta.Errorf("%v\n", err) return 1 } @@ -87,13 +87,13 @@ func (c *CmdUserAdd) Run(args []string) int { mailData, err := repo.MailData() if err != nil { - fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) + c.Meta.Errorf("%v\n", err) return 1 } err = repo.GenerateDatabases(mailData) if err != nil { - fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) + c.Meta.Errorf("%v\n", err) return 1 } diff --git a/cmd/mailfull/cmd_usercheckpw.go b/cmd/mailfull/cmd_usercheckpw.go index 5403eea..65542aa 100644 --- a/cmd/mailfull/cmd_usercheckpw.go +++ b/cmd/mailfull/cmd_usercheckpw.go @@ -67,24 +67,24 @@ func (c *CmdUserCheckPw) Run(args []string) int { repo, err := mailfull.OpenRepository(".") if err != nil { - fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) + c.Meta.Errorf("%v\n", err) return 1 } user, err := repo.User(domainName, userName) if err != nil { - fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) + c.Meta.Errorf("%v\n", err) return 1 } if user == nil { - fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", mailfull.ErrUserNotExist) + c.Meta.Errorf("%v\n", mailfull.ErrUserNotExist) return 1 } if len(args) != 2 { input, err := c.UI.AskSecret(fmt.Sprintf("Enter password for %s:", address)) if err != nil { - fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) + c.Meta.Errorf("%v\n", err) return 1 } diff --git a/cmd/mailfull/cmd_userdel.go b/cmd/mailfull/cmd_userdel.go index 559fcec..cb35a9d 100644 --- a/cmd/mailfull/cmd_userdel.go +++ b/cmd/mailfull/cmd_userdel.go @@ -66,17 +66,17 @@ func (c *CmdUserDel) Run(args []string) int { repo, err := mailfull.OpenRepository(".") if err != nil { - fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) + c.Meta.Errorf("%v\n", err) return 1 } if userName == "postmaster" { - fmt.Fprintf(c.UI.ErrorWriter, "[ERR] Cannot delete postmaster.\n") + c.Meta.Errorf("Cannot delete postmaster.\n") return 1 } if err := repo.UserRemove(domainName, userName); err != nil { - fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) + c.Meta.Errorf("%v\n", err) return 1 } @@ -86,13 +86,13 @@ func (c *CmdUserDel) Run(args []string) int { mailData, err := repo.MailData() if err != nil { - fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) + c.Meta.Errorf("%v\n", err) return 1 } err = repo.GenerateDatabases(mailData) if err != nil { - fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) + c.Meta.Errorf("%v\n", err) return 1 } diff --git a/cmd/mailfull/cmd_userpasswd.go b/cmd/mailfull/cmd_userpasswd.go index 38c113c..1ea371e 100644 --- a/cmd/mailfull/cmd_userpasswd.go +++ b/cmd/mailfull/cmd_userpasswd.go @@ -75,33 +75,33 @@ func (c *CmdUserPasswd) Run(args []string) int { repo, err := mailfull.OpenRepository(".") if err != nil { - fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) + c.Meta.Errorf("%v\n", err) return 1 } user, err := repo.User(domainName, userName) if err != nil { - fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) + c.Meta.Errorf("%v\n", err) return 1 } if user == nil { - fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", mailfull.ErrUserNotExist) + c.Meta.Errorf("%v\n", mailfull.ErrUserNotExist) return 1 } if len(args) != 2 { input1, err := c.UI.AskSecret(fmt.Sprintf("Enter new password for %s:", address)) if err != nil { - fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) + c.Meta.Errorf("%v\n", err) return 1 } input2, err := c.UI.AskSecret("Retype new password:") if err != nil { - fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) + c.Meta.Errorf("%v\n", err) return 1 } if input1 != input2 { - fmt.Fprintf(c.UI.ErrorWriter, "[ERR] inputs do not match.\n") + c.Meta.Errorf("inputs do not match.\n") return 1 } rawPassword = input1 @@ -111,7 +111,7 @@ func (c *CmdUserPasswd) Run(args []string) int { if rawPassword != "" { str, err := ssha.Generate(rawPassword, 4) if err != nil { - fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) + c.Meta.Errorf("%v\n", err) return 1 } hashedPassword = str @@ -120,7 +120,7 @@ func (c *CmdUserPasswd) Run(args []string) int { user.SetHashedPassword(hashedPassword) if err := repo.UserUpdate(domainName, user); err != nil { - fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) + c.Meta.Errorf("%v\n", err) return 1 } @@ -130,13 +130,13 @@ func (c *CmdUserPasswd) Run(args []string) int { mailData, err := repo.MailData() if err != nil { - fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) + c.Meta.Errorf("%v\n", err) return 1 } err = repo.GenerateDatabases(mailData) if err != nil { - fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) + c.Meta.Errorf("%v\n", err) return 1 } diff --git a/cmd/mailfull/cmd_users.go b/cmd/mailfull/cmd_users.go index cb61bbe..2dc0cda 100644 --- a/cmd/mailfull/cmd_users.go +++ b/cmd/mailfull/cmd_users.go @@ -48,13 +48,13 @@ func (c *CmdUsers) Run(args []string) int { repo, err := mailfull.OpenRepository(".") if err != nil { - fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) + c.Meta.Errorf("%v\n", err) return 1 } users, err := repo.Users(targetDomainName) if err != nil { - fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) + c.Meta.Errorf("%v\n", err) return 1 } sort.Sort(mailfull.UserSlice(users))