1
0
mirror of https://github.com/directorz/mailfull-go.git synced 2025-12-17 17:47:04 +00:00

Use Errorf

This commit is contained in:
teru
2017-07-25 11:57:30 +09:00
parent 2e87209ad2
commit 146ab299d0
23 changed files with 97 additions and 97 deletions

View File

@@ -60,18 +60,18 @@ func (c *CmdAliasDomainAdd) Run(args []string) int {
repo, err := mailfull.OpenRepository(".") repo, err := mailfull.OpenRepository(".")
if err != nil { if err != nil {
fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) c.Meta.Errorf("%v\n", err)
return 1 return 1
} }
aliasDomain, err := mailfull.NewAliasDomain(aliasDomainName, targetDomainName) aliasDomain, err := mailfull.NewAliasDomain(aliasDomainName, targetDomainName)
if err != nil { if err != nil {
fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) c.Meta.Errorf("%v\n", err)
return 1 return 1
} }
if err := repo.AliasDomainCreate(aliasDomain); err != nil { if err := repo.AliasDomainCreate(aliasDomain); err != nil {
fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) c.Meta.Errorf("%v\n", err)
return 1 return 1
} }
@@ -81,13 +81,13 @@ func (c *CmdAliasDomainAdd) Run(args []string) int {
mailData, err := repo.MailData() mailData, err := repo.MailData()
if err != nil { if err != nil {
fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) c.Meta.Errorf("%v\n", err)
return 1 return 1
} }
err = repo.GenerateDatabases(mailData) err = repo.GenerateDatabases(mailData)
if err != nil { if err != nil {
fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) c.Meta.Errorf("%v\n", err)
return 1 return 1
} }

View File

@@ -57,12 +57,12 @@ func (c *CmdAliasDomainDel) Run(args []string) int {
repo, err := mailfull.OpenRepository(".") repo, err := mailfull.OpenRepository(".")
if err != nil { if err != nil {
fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) c.Meta.Errorf("%v\n", err)
return 1 return 1
} }
if err := repo.AliasDomainRemove(aliasDomainName); err != nil { if err := repo.AliasDomainRemove(aliasDomainName); err != nil {
fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) c.Meta.Errorf("%v\n", err)
return 1 return 1
} }
@@ -72,13 +72,13 @@ func (c *CmdAliasDomainDel) Run(args []string) int {
mailData, err := repo.MailData() mailData, err := repo.MailData()
if err != nil { if err != nil {
fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) c.Meta.Errorf("%v\n", err)
return 1 return 1
} }
err = repo.GenerateDatabases(mailData) err = repo.GenerateDatabases(mailData)
if err != nil { if err != nil {
fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) c.Meta.Errorf("%v\n", err)
return 1 return 1
} }

View File

@@ -51,13 +51,13 @@ func (c *CmdAliasDomains) Run(args []string) int {
repo, err := mailfull.OpenRepository(".") repo, err := mailfull.OpenRepository(".")
if err != nil { if err != nil {
fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) c.Meta.Errorf("%v\n", err)
return 1 return 1
} }
aliasDomains, err := repo.AliasDomains() aliasDomains, err := repo.AliasDomains()
if err != nil { if err != nil {
fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) c.Meta.Errorf("%v\n", err)
return 1 return 1
} }
sort.Sort(mailfull.AliasDomainSlice(aliasDomains)) sort.Sort(mailfull.AliasDomainSlice(aliasDomains))

View File

@@ -69,18 +69,18 @@ func (c *CmdAliasUserAdd) Run(args []string) int {
repo, err := mailfull.OpenRepository(".") repo, err := mailfull.OpenRepository(".")
if err != nil { if err != nil {
fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) c.Meta.Errorf("%v\n", err)
return 1 return 1
} }
aliasUser, err := mailfull.NewAliasUser(aliasUserName, targets) aliasUser, err := mailfull.NewAliasUser(aliasUserName, targets)
if err != nil { if err != nil {
fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) c.Meta.Errorf("%v\n", err)
return 1 return 1
} }
if err := repo.AliasUserCreate(domainName, aliasUser); err != nil { 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 return 1
} }
@@ -90,13 +90,13 @@ func (c *CmdAliasUserAdd) Run(args []string) int {
mailData, err := repo.MailData() mailData, err := repo.MailData()
if err != nil { if err != nil {
fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) c.Meta.Errorf("%v\n", err)
return 1 return 1
} }
err = repo.GenerateDatabases(mailData) err = repo.GenerateDatabases(mailData)
if err != nil { if err != nil {
fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) c.Meta.Errorf("%v\n", err)
return 1 return 1
} }

View File

@@ -65,12 +65,12 @@ func (c *CmdAliasUserDel) Run(args []string) int {
repo, err := mailfull.OpenRepository(".") repo, err := mailfull.OpenRepository(".")
if err != nil { if err != nil {
fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) c.Meta.Errorf("%v\n", err)
return 1 return 1
} }
if err := repo.AliasUserRemove(domainName, aliasUserName); err != nil { 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 return 1
} }
@@ -80,13 +80,13 @@ func (c *CmdAliasUserDel) Run(args []string) int {
mailData, err := repo.MailData() mailData, err := repo.MailData()
if err != nil { if err != nil {
fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) c.Meta.Errorf("%v\n", err)
return 1 return 1
} }
err = repo.GenerateDatabases(mailData) err = repo.GenerateDatabases(mailData)
if err != nil { if err != nil {
fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) c.Meta.Errorf("%v\n", err)
return 1 return 1
} }

View File

@@ -69,27 +69,27 @@ func (c *CmdAliasUserMod) Run(args []string) int {
repo, err := mailfull.OpenRepository(".") repo, err := mailfull.OpenRepository(".")
if err != nil { if err != nil {
fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) c.Meta.Errorf("%v\n", err)
return 1 return 1
} }
aliasUser, err := repo.AliasUser(domainName, aliasUserName) aliasUser, err := repo.AliasUser(domainName, aliasUserName)
if err != nil { if err != nil {
fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) c.Meta.Errorf("%v\n", err)
return 1 return 1
} }
if aliasUser == nil { if aliasUser == nil {
fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", mailfull.ErrAliasUserNotExist) c.Meta.Errorf("%v\n", mailfull.ErrAliasUserNotExist)
return 1 return 1
} }
if err := aliasUser.SetTargets(targets); err != nil { if err := aliasUser.SetTargets(targets); err != nil {
fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) c.Meta.Errorf("%v\n", err)
return 1 return 1
} }
if err := repo.AliasUserUpdate(domainName, aliasUser); err != nil { 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 return 1
} }
@@ -99,13 +99,13 @@ func (c *CmdAliasUserMod) Run(args []string) int {
mailData, err := repo.MailData() mailData, err := repo.MailData()
if err != nil { if err != nil {
fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) c.Meta.Errorf("%v\n", err)
return 1 return 1
} }
err = repo.GenerateDatabases(mailData) err = repo.GenerateDatabases(mailData)
if err != nil { if err != nil {
fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) c.Meta.Errorf("%v\n", err)
return 1 return 1
} }

View File

@@ -48,13 +48,13 @@ func (c *CmdAliasUsers) Run(args []string) int {
repo, err := mailfull.OpenRepository(".") repo, err := mailfull.OpenRepository(".")
if err != nil { if err != nil {
fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) c.Meta.Errorf("%v\n", err)
return 1 return 1
} }
aliasUsers, err := repo.AliasUsers(targetDomainName) aliasUsers, err := repo.AliasUsers(targetDomainName)
if err != nil { if err != nil {
fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) c.Meta.Errorf("%v\n", err)
return 1 return 1
} }
sort.Sort(mailfull.AliasUserSlice(aliasUsers)) sort.Sort(mailfull.AliasUserSlice(aliasUsers))

View File

@@ -47,13 +47,13 @@ func (c *CmdCatchAll) Run(args []string) int {
repo, err := mailfull.OpenRepository(".") repo, err := mailfull.OpenRepository(".")
if err != nil { if err != nil {
fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) c.Meta.Errorf("%v\n", err)
return 1 return 1
} }
catchAllUser, err := repo.CatchAllUser(domainName) catchAllUser, err := repo.CatchAllUser(domainName)
if err != nil { if err != nil {
fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) c.Meta.Errorf("%v\n", err)
return 1 return 1
} }

View File

@@ -60,18 +60,18 @@ func (c *CmdCatchAllSet) Run(args []string) int {
repo, err := mailfull.OpenRepository(".") repo, err := mailfull.OpenRepository(".")
if err != nil { if err != nil {
fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) c.Meta.Errorf("%v\n", err)
return 1 return 1
} }
catchAllUser, err := mailfull.NewCatchAllUser(userName) catchAllUser, err := mailfull.NewCatchAllUser(userName)
if err != nil { if err != nil {
fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) c.Meta.Errorf("%v\n", err)
return 1 return 1
} }
if err := repo.CatchAllUserSet(domainName, catchAllUser); err != nil { 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 return 1
} }
@@ -81,13 +81,13 @@ func (c *CmdCatchAllSet) Run(args []string) int {
mailData, err := repo.MailData() mailData, err := repo.MailData()
if err != nil { if err != nil {
fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) c.Meta.Errorf("%v\n", err)
return 1 return 1
} }
err = repo.GenerateDatabases(mailData) err = repo.GenerateDatabases(mailData)
if err != nil { if err != nil {
fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) c.Meta.Errorf("%v\n", err)
return 1 return 1
} }

View File

@@ -57,12 +57,12 @@ func (c *CmdCatchAllUnset) Run(args []string) int {
repo, err := mailfull.OpenRepository(".") repo, err := mailfull.OpenRepository(".")
if err != nil { if err != nil {
fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) c.Meta.Errorf("%v\n", err)
return 1 return 1
} }
if err := repo.CatchAllUserUnset(domainName); err != nil { if err := repo.CatchAllUserUnset(domainName); err != nil {
fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) c.Meta.Errorf("%v\n", err)
return 1 return 1
} }
@@ -72,13 +72,13 @@ func (c *CmdCatchAllUnset) Run(args []string) int {
mailData, err := repo.MailData() mailData, err := repo.MailData()
if err != nil { if err != nil {
fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) c.Meta.Errorf("%v\n", err)
return 1 return 1
} }
err = repo.GenerateDatabases(mailData) err = repo.GenerateDatabases(mailData)
if err != nil { if err != nil {
fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) c.Meta.Errorf("%v\n", err)
return 1 return 1
} }

View File

@@ -36,19 +36,19 @@ Description:
func (c *CmdCommit) Run(args []string) int { func (c *CmdCommit) Run(args []string) int {
repo, err := mailfull.OpenRepository(".") repo, err := mailfull.OpenRepository(".")
if err != nil { if err != nil {
fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) c.Meta.Errorf("%v\n", err)
return 1 return 1
} }
mailData, err := repo.MailData() mailData, err := repo.MailData()
if err != nil { if err != nil {
fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) c.Meta.Errorf("%v\n", err)
return 1 return 1
} }
err = repo.GenerateDatabases(mailData) err = repo.GenerateDatabases(mailData)
if err != nil { if err != nil {
fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) c.Meta.Errorf("%v\n", err)
return 1 return 1
} }

View File

@@ -57,29 +57,29 @@ func (c *CmdDomainAdd) Run(args []string) int {
repo, err := mailfull.OpenRepository(".") repo, err := mailfull.OpenRepository(".")
if err != nil { if err != nil {
fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) c.Meta.Errorf("%v\n", err)
return 1 return 1
} }
domain, err := mailfull.NewDomain(domainName) domain, err := mailfull.NewDomain(domainName)
if err != nil { if err != nil {
fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) c.Meta.Errorf("%v\n", err)
return 1 return 1
} }
if err := repo.DomainCreate(domain); err != nil { if err := repo.DomainCreate(domain); err != nil {
fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) c.Meta.Errorf("%v\n", err)
return 1 return 1
} }
user, err := mailfull.NewUser("postmaster", mailfull.NeverMatchHashedPassword, nil) user, err := mailfull.NewUser("postmaster", mailfull.NeverMatchHashedPassword, nil)
if err != nil { if err != nil {
fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) c.Meta.Errorf("%v\n", err)
return 1 return 1
} }
if err := repo.UserCreate(domainName, user); err != nil { 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 return 1
} }
@@ -89,13 +89,13 @@ func (c *CmdDomainAdd) Run(args []string) int {
mailData, err := repo.MailData() mailData, err := repo.MailData()
if err != nil { if err != nil {
fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) c.Meta.Errorf("%v\n", err)
return 1 return 1
} }
err = repo.GenerateDatabases(mailData) err = repo.GenerateDatabases(mailData)
if err != nil { if err != nil {
fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) c.Meta.Errorf("%v\n", err)
return 1 return 1
} }

View File

@@ -57,12 +57,12 @@ func (c *CmdDomainDel) Run(args []string) int {
repo, err := mailfull.OpenRepository(".") repo, err := mailfull.OpenRepository(".")
if err != nil { if err != nil {
fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) c.Meta.Errorf("%v\n", err)
return 1 return 1
} }
if err := repo.DomainRemove(domainName); err != nil { if err := repo.DomainRemove(domainName); err != nil {
fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) c.Meta.Errorf("%v\n", err)
return 1 return 1
} }
@@ -72,13 +72,13 @@ func (c *CmdDomainDel) Run(args []string) int {
mailData, err := repo.MailData() mailData, err := repo.MailData()
if err != nil { if err != nil {
fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) c.Meta.Errorf("%v\n", err)
return 1 return 1
} }
err = repo.GenerateDatabases(mailData) err = repo.GenerateDatabases(mailData)
if err != nil { if err != nil {
fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) c.Meta.Errorf("%v\n", err)
return 1 return 1
} }

View File

@@ -57,24 +57,24 @@ func (c *CmdDomainDisable) Run(args []string) int {
repo, err := mailfull.OpenRepository(".") repo, err := mailfull.OpenRepository(".")
if err != nil { if err != nil {
fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) c.Meta.Errorf("%v\n", err)
return 1 return 1
} }
domain, err := repo.Domain(domainName) domain, err := repo.Domain(domainName)
if err != nil { if err != nil {
fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) c.Meta.Errorf("%v\n", err)
return 1 return 1
} }
if domain == nil { if domain == nil {
fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", mailfull.ErrDomainNotExist) c.Meta.Errorf("%v\n", mailfull.ErrDomainNotExist)
return 1 return 1
} }
domain.SetDisabled(true) domain.SetDisabled(true)
if err := repo.DomainUpdate(domain); err != nil { if err := repo.DomainUpdate(domain); err != nil {
fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) c.Meta.Errorf("%v\n", err)
return 1 return 1
} }
@@ -84,13 +84,13 @@ func (c *CmdDomainDisable) Run(args []string) int {
mailData, err := repo.MailData() mailData, err := repo.MailData()
if err != nil { if err != nil {
fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) c.Meta.Errorf("%v\n", err)
return 1 return 1
} }
err = repo.GenerateDatabases(mailData) err = repo.GenerateDatabases(mailData)
if err != nil { if err != nil {
fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) c.Meta.Errorf("%v\n", err)
return 1 return 1
} }

View File

@@ -57,24 +57,24 @@ func (c *CmdDomainEnable) Run(args []string) int {
repo, err := mailfull.OpenRepository(".") repo, err := mailfull.OpenRepository(".")
if err != nil { if err != nil {
fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) c.Meta.Errorf("%v\n", err)
return 1 return 1
} }
domain, err := repo.Domain(domainName) domain, err := repo.Domain(domainName)
if err != nil { if err != nil {
fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) c.Meta.Errorf("%v\n", err)
return 1 return 1
} }
if domain == nil { if domain == nil {
fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", mailfull.ErrDomainNotExist) c.Meta.Errorf("%v\n", mailfull.ErrDomainNotExist)
return 1 return 1
} }
domain.SetDisabled(false) domain.SetDisabled(false)
if err := repo.DomainUpdate(domain); err != nil { if err := repo.DomainUpdate(domain); err != nil {
fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) c.Meta.Errorf("%v\n", err)
return 1 return 1
} }
@@ -84,13 +84,13 @@ func (c *CmdDomainEnable) Run(args []string) int {
mailData, err := repo.MailData() mailData, err := repo.MailData()
if err != nil { if err != nil {
fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) c.Meta.Errorf("%v\n", err)
return 1 return 1
} }
err = repo.GenerateDatabases(mailData) err = repo.GenerateDatabases(mailData)
if err != nil { if err != nil {
fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) c.Meta.Errorf("%v\n", err)
return 1 return 1
} }

View File

@@ -38,13 +38,13 @@ Description:
func (c *CmdDomains) Run(args []string) int { func (c *CmdDomains) Run(args []string) int {
repo, err := mailfull.OpenRepository(".") repo, err := mailfull.OpenRepository(".")
if err != nil { if err != nil {
fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) c.Meta.Errorf("%v\n", err)
return 1 return 1
} }
domains, err := repo.Domains() domains, err := repo.Domains()
if err != nil { if err != nil {
fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) c.Meta.Errorf("%v\n", err)
return 1 return 1
} }
sort.Sort(mailfull.DomainSlice(domains)) sort.Sort(mailfull.DomainSlice(domains))

View File

@@ -48,7 +48,7 @@ func (c *CmdGenConfig) Run(args []string) int {
repo, err := mailfull.OpenRepository(".") repo, err := mailfull.OpenRepository(".")
if err != nil { if err != nil {
fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) c.Meta.Errorf("%v\n", err)
return 1 return 1
} }
@@ -60,7 +60,7 @@ func (c *CmdGenConfig) Run(args []string) int {
fmt.Fprintf(c.UI.Writer, "%s", repo.GenerateConfigDovecot()) fmt.Fprintf(c.UI.Writer, "%s", repo.GenerateConfigDovecot())
default: default:
fmt.Fprintf(c.UI.ErrorWriter, "[ERR] Specify \"postfix\" or \"dovecot\".\n") c.Meta.Errorf("Specify \"postfix\" or \"dovecot\".\n")
return 1 return 1
} }

View File

@@ -35,7 +35,7 @@ Description:
// Run runs the command and returns the exit status. // Run runs the command and returns the exit status.
func (c *CmdInit) Run(args []string) int { func (c *CmdInit) Run(args []string) int {
if err := mailfull.InitRepository("."); err != nil { if err := mailfull.InitRepository("."); err != nil {
fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) c.Meta.Errorf("%v\n", err)
return 1 return 1
} }

View File

@@ -66,18 +66,18 @@ func (c *CmdUserAdd) Run(args []string) int {
repo, err := mailfull.OpenRepository(".") repo, err := mailfull.OpenRepository(".")
if err != nil { if err != nil {
fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) c.Meta.Errorf("%v\n", err)
return 1 return 1
} }
user, err := mailfull.NewUser(userName, mailfull.NeverMatchHashedPassword, nil) user, err := mailfull.NewUser(userName, mailfull.NeverMatchHashedPassword, nil)
if err != nil { if err != nil {
fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) c.Meta.Errorf("%v\n", err)
return 1 return 1
} }
if err := repo.UserCreate(domainName, user); err != nil { 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 return 1
} }
@@ -87,13 +87,13 @@ func (c *CmdUserAdd) Run(args []string) int {
mailData, err := repo.MailData() mailData, err := repo.MailData()
if err != nil { if err != nil {
fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) c.Meta.Errorf("%v\n", err)
return 1 return 1
} }
err = repo.GenerateDatabases(mailData) err = repo.GenerateDatabases(mailData)
if err != nil { if err != nil {
fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) c.Meta.Errorf("%v\n", err)
return 1 return 1
} }

View File

@@ -67,24 +67,24 @@ func (c *CmdUserCheckPw) Run(args []string) int {
repo, err := mailfull.OpenRepository(".") repo, err := mailfull.OpenRepository(".")
if err != nil { if err != nil {
fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) c.Meta.Errorf("%v\n", err)
return 1 return 1
} }
user, err := repo.User(domainName, userName) user, err := repo.User(domainName, userName)
if err != nil { if err != nil {
fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) c.Meta.Errorf("%v\n", err)
return 1 return 1
} }
if user == nil { if user == nil {
fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", mailfull.ErrUserNotExist) c.Meta.Errorf("%v\n", mailfull.ErrUserNotExist)
return 1 return 1
} }
if len(args) != 2 { if len(args) != 2 {
input, err := c.UI.AskSecret(fmt.Sprintf("Enter password for %s:", address)) input, err := c.UI.AskSecret(fmt.Sprintf("Enter password for %s:", address))
if err != nil { if err != nil {
fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) c.Meta.Errorf("%v\n", err)
return 1 return 1
} }

View File

@@ -66,17 +66,17 @@ func (c *CmdUserDel) Run(args []string) int {
repo, err := mailfull.OpenRepository(".") repo, err := mailfull.OpenRepository(".")
if err != nil { if err != nil {
fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) c.Meta.Errorf("%v\n", err)
return 1 return 1
} }
if userName == "postmaster" { if userName == "postmaster" {
fmt.Fprintf(c.UI.ErrorWriter, "[ERR] Cannot delete postmaster.\n") c.Meta.Errorf("Cannot delete postmaster.\n")
return 1 return 1
} }
if err := repo.UserRemove(domainName, userName); err != nil { 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 return 1
} }
@@ -86,13 +86,13 @@ func (c *CmdUserDel) Run(args []string) int {
mailData, err := repo.MailData() mailData, err := repo.MailData()
if err != nil { if err != nil {
fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) c.Meta.Errorf("%v\n", err)
return 1 return 1
} }
err = repo.GenerateDatabases(mailData) err = repo.GenerateDatabases(mailData)
if err != nil { if err != nil {
fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) c.Meta.Errorf("%v\n", err)
return 1 return 1
} }

View File

@@ -75,33 +75,33 @@ func (c *CmdUserPasswd) Run(args []string) int {
repo, err := mailfull.OpenRepository(".") repo, err := mailfull.OpenRepository(".")
if err != nil { if err != nil {
fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) c.Meta.Errorf("%v\n", err)
return 1 return 1
} }
user, err := repo.User(domainName, userName) user, err := repo.User(domainName, userName)
if err != nil { if err != nil {
fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) c.Meta.Errorf("%v\n", err)
return 1 return 1
} }
if user == nil { if user == nil {
fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", mailfull.ErrUserNotExist) c.Meta.Errorf("%v\n", mailfull.ErrUserNotExist)
return 1 return 1
} }
if len(args) != 2 { if len(args) != 2 {
input1, err := c.UI.AskSecret(fmt.Sprintf("Enter new password for %s:", address)) input1, err := c.UI.AskSecret(fmt.Sprintf("Enter new password for %s:", address))
if err != nil { if err != nil {
fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) c.Meta.Errorf("%v\n", err)
return 1 return 1
} }
input2, err := c.UI.AskSecret("Retype new password:") input2, err := c.UI.AskSecret("Retype new password:")
if err != nil { if err != nil {
fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) c.Meta.Errorf("%v\n", err)
return 1 return 1
} }
if input1 != input2 { if input1 != input2 {
fmt.Fprintf(c.UI.ErrorWriter, "[ERR] inputs do not match.\n") c.Meta.Errorf("inputs do not match.\n")
return 1 return 1
} }
rawPassword = input1 rawPassword = input1
@@ -111,7 +111,7 @@ func (c *CmdUserPasswd) Run(args []string) int {
if rawPassword != "" { if rawPassword != "" {
str, err := ssha.Generate(rawPassword, 4) str, err := ssha.Generate(rawPassword, 4)
if err != nil { if err != nil {
fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) c.Meta.Errorf("%v\n", err)
return 1 return 1
} }
hashedPassword = str hashedPassword = str
@@ -120,7 +120,7 @@ func (c *CmdUserPasswd) Run(args []string) int {
user.SetHashedPassword(hashedPassword) user.SetHashedPassword(hashedPassword)
if err := repo.UserUpdate(domainName, user); err != nil { 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 return 1
} }
@@ -130,13 +130,13 @@ func (c *CmdUserPasswd) Run(args []string) int {
mailData, err := repo.MailData() mailData, err := repo.MailData()
if err != nil { if err != nil {
fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) c.Meta.Errorf("%v\n", err)
return 1 return 1
} }
err = repo.GenerateDatabases(mailData) err = repo.GenerateDatabases(mailData)
if err != nil { if err != nil {
fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) c.Meta.Errorf("%v\n", err)
return 1 return 1
} }

View File

@@ -48,13 +48,13 @@ func (c *CmdUsers) Run(args []string) int {
repo, err := mailfull.OpenRepository(".") repo, err := mailfull.OpenRepository(".")
if err != nil { if err != nil {
fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) c.Meta.Errorf("%v\n", err)
return 1 return 1
} }
users, err := repo.Users(targetDomainName) users, err := repo.Users(targetDomainName)
if err != nil { if err != nil {
fmt.Fprintf(c.UI.ErrorWriter, "[ERR] %v\n", err) c.Meta.Errorf("%v\n", err)
return 1 return 1
} }
sort.Sort(mailfull.UserSlice(users)) sort.Sort(mailfull.UserSlice(users))