e2m/dispatch
4
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Add option --config and --data to specify where to store the configuration and the data

Browse source
This commit is contained in:
Pierre-Alain TORET 2020-03-10 23:56:07 +01:00
parent 855f4d3e64
commit ca81475fa5
8 changed files with 33 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

4
commands/clear.go
View file

@ -13,14 +13,14 @@ var clearCmd = &cobra.Command{
Use: "clear",
Short: "Clear all user data",
Run: func(cmd *cobra.Command, args []string) {
err := os.Remove(storage.Path.Database())
err := os.Remove(storage.DataPath.Database())
if err == nil || os.IsNotExist(err) {
log.Println("Database cleared")
} else {
log.Println(err)
}
err = os.RemoveAll(storage.Path.Users())
err = os.RemoveAll(storage.DataPath.Users())
if err == nil {
log.Println("User data cleared")
} else {

2
commands/config.go
View file

@ -16,7 +16,7 @@ var (
Short: "Edit config file",
Run: func(cmd *cobra.Command, args []string) {
if editor := findEditor(); editor != "" {
process := exec.Command(editor, storage.Path.Config())
process := exec.Command(editor, storage.ConfigPath.Config())
process.Stdin = os.Stdin
process.Stdout = os.Stdout
process.Stderr = os.Stderr

14
commands/dispatch.go
View file

@ -46,18 +46,18 @@ var rootCmd = &cobra.Command{
fmt.Printf(logo, version.Tag, version.Commit, version.Date, runtime.Version())
}
storage.Initialize(viper.GetString("dir"))
storage.Initialize()
initConfig(storage.Path.Config(), viper.GetBool("reset-config"))
initConfig(storage.ConfigPath.Config(), viper.GetBool("reset-config"))
},
Run: func(cmd *cobra.Command, args []string) {
if viper.GetBool("dev") {
log.Println("Running in development mode, access client at http://localhost:3000")
}
log.Println("Storing data at", storage.Path.Root())
log.Println("Storing data at", storage.DataPath.Root())
db, err := boltdb.New(storage.Path.Database())
db, err := boltdb.New(storage.DataPath.Database())
if err != nil {
log.Fatal(err)
}
@ -77,11 +77,11 @@ var rootCmd = &cobra.Command{
dispatch.SessionStore = db
dispatch.GetMessageStore = func(user *storage.User) (storage.MessageStore, error) {
return boltdb.New(storage.Path.Log(user.Username))
return boltdb.New(storage.DataPath.Log(user.Username))
}
dispatch.GetMessageSearchProvider = func(user *storage.User) (storage.MessageSearchProvider, error) {
return bleve.New(storage.Path.Index(user.Username))
return bleve.New(storage.DataPath.Index(user.Username))
}
dispatch.Run()
@ -97,6 +97,8 @@ func init() {
rootCmd.AddCommand(configCmd)
rootCmd.AddCommand(versionCmd)
rootCmd.PersistentFlags().String("data", storage.DefaultDirectory(), "directory to store data in")
rootCmd.PersistentFlags().String("conf", storage.DefaultDirectory(), "directory to store configuration in")
rootCmd.PersistentFlags().String("dir", storage.DefaultDirectory(), "directory to store config and data in")
rootCmd.PersistentFlags().Bool("reset-config", false, "reset to the default configuration, overwriting the current one")
rootCmd.Flags().StringP("address", "a", "", "interface to which the server will bind")