diff --git a/app/main.go b/app/main.go index 45c206dd..8868eec1 100644 --- a/app/main.go +++ b/app/main.go @@ -32,25 +32,25 @@ type Opts struct { SecretKey string `long:"secret" env:"SECRET" required:"true" description:"secret key"` RemarkURL string `long:"url" env:"REMARK_URL" required:"true" description:"url to remark"` - BoltPath string `long:"bolt" env:"BOLTDB_PATH" default:"./var" description:"parent dir for bolt files"` - Sites []string `long:"site" env:"SITE" default:"remark" description:"site names" env-delim:","` - Admins []string `long:"admin" env:"ADMIN" description:"admin(s) names" env-delim:","` - AdminEmail string `long:"admin-email" env:"ADMIN_EMAIL" default:"" description:"admin email"` - DevPasswd string `long:"dev-passwd" env:"DEV_PASSWD" default:"" description:"development mode password"` - BackupLocation string `long:"backup" env:"BACKUP_PATH" default:"./var/backup" description:"backups location"` - MaxBackupFiles int `long:"max-back" env:"MAX_BACKUP_FILES" default:"10" description:"max backups to keep"` - AvatarStore string `long:"avatars" env:"AVATAR_STORE" default:"./var/avatars" description:"avatars location"` - ImageProxy bool `long:"img-proxy" env:"IMG_PROXY" description:"enable image proxy"` - MaxCommentSize int `long:"max-comment" env:"MAX_COMMENT_SIZE" default:"2048" description:"max comment size"` - MaxCachedItems int `long:"max-cache-items" env:"MAX_CACHE_ITEMS" default:"1000" description:"max cached items"` - MaxCachedValue int `long:"max-cache-value" env:"MAX_CACHE_VALUE" default:"65536" description:"max size of cached value"` - MaxCacheSize int `long:"max-cache-size" env:"MAX_CACHE_SIZE" default:"50000000" description:"max size of total cache"` - LowScore int `long:"low-score" env:"LOW_SCORE" default:"-5" description:"low score threshold"` - CriticalScore int `long:"critical-score" env:"CRITICAL_SCORE" default:"-10" description:"critical score threshold"` - ReadOnlyAge int `long:"read-age" env:"READONLY_AGE" default:"0" description:"read-only age of comments"` - Port int `long:"port" env:"REMARK_PORT" default:"8080" description:"port"` - WebRoot string `long:"web-root" env:"REMARK_WEB_ROOT" default:"./web" description:"web root directory"` - Dbg bool `long:"dbg" env:"DEBUG" description:"debug mode"` + Store StoreGroup `group:"store" namespace:"store" env-namespace:"STORE"` + Sites []string `long:"site" env:"SITE" default:"remark" description:"site names" env-delim:","` + Admins []string `long:"admin" env:"ADMIN" description:"admin(s) names" env-delim:","` + AdminEmail string `long:"admin-email" env:"ADMIN_EMAIL" default:"" description:"admin email"` + DevPasswd string `long:"dev-passwd" env:"DEV_PASSWD" default:"" description:"development mode password"` + BackupLocation string `long:"backup" env:"BACKUP_PATH" default:"./var/backup" description:"backups location"` + MaxBackupFiles int `long:"max-back" env:"MAX_BACKUP_FILES" default:"10" description:"max backups to keep"` + AvatarStore string `long:"avatars" env:"AVATAR_STORE" default:"./var/avatars" description:"avatars location"` + ImageProxy bool `long:"img-proxy" env:"IMG_PROXY" description:"enable image proxy"` + MaxCommentSize int `long:"max-comment" env:"MAX_COMMENT_SIZE" default:"2048" description:"max comment size"` + MaxCachedItems int `long:"max-cache-items" env:"MAX_CACHE_ITEMS" default:"1000" description:"max cached items"` + MaxCachedValue int `long:"max-cache-value" env:"MAX_CACHE_VALUE" default:"65536" description:"max size of cached value"` + MaxCacheSize int `long:"max-cache-size" env:"MAX_CACHE_SIZE" default:"50000000" description:"max size of total cache"` + LowScore int `long:"low-score" env:"LOW_SCORE" default:"-5" description:"low score threshold"` + CriticalScore int `long:"critical-score" env:"CRITICAL_SCORE" default:"-10" description:"critical score threshold"` + ReadOnlyAge int `long:"read-age" env:"READONLY_AGE" default:"0" description:"read-only age of comments"` + Port int `long:"port" env:"REMARK_PORT" default:"8080" description:"port"` + WebRoot string `long:"web-root" env:"REMARK_WEB_ROOT" default:"./web" description:"web root directory"` + Dbg bool `long:"dbg" env:"DEBUG" description:"debug mode"` Auth struct { Google AuthGroup `group:"google" namespace:"google" env-namespace:"GOOGLE" description:"Google OAuth"` @@ -66,6 +66,15 @@ type AuthGroup struct { CSEC string `long:"csec" env:"CSEC" description:"OAuth client secret"` } +// StoreGroup defines options group for store params +type StoreGroup struct { + Type string `long:"type" env:"TYPE" description:"type of storage" choice:"bolt" choice:"mongo" default:"bolt"` + Bolt struct { + Path string `long:"path" env:"PATH" default:"./var" description:"parent dir for bolt files"` + Timeout time.Duration `long:"timeout" env:"TIMEOUT" default:"30s" description:"bolt timeout"` + } `group:"bolt" namespace:"bolt" env-namespace:"BOLT"` +} + var revision = "unknown" // Application holds all active objects @@ -111,7 +120,7 @@ func main() { // doesn't start anything func New(opts Opts) (*Application, error) { - if err := makeDirs(opts.BoltPath, opts.BackupLocation, opts.AvatarStore); err != nil { + if err := makeDirs(opts.BackupLocation, opts.AvatarStore); err != nil { return nil, err } @@ -119,7 +128,7 @@ func New(opts Opts) (*Application, error) { return nil, errors.Errorf("invalid remark42 url %s", opts.RemarkURL) } - boltStore, err := makeBoltStore(opts.Sites, opts.BoltPath) + boltStore, err := makeStore(opts.Store, opts.Sites) if err != nil { return nil, err } @@ -224,17 +233,23 @@ func (a *Application) activateBackup(ctx context.Context) { } } -// makeBoltStore creates store for all sites -func makeBoltStore(siteNames []string, path string) (engine.Interface, error) { - sites := []engine.BoltSite{} - for _, site := range siteNames { - sites = append(sites, engine.BoltSite{SiteID: site, FileName: fmt.Sprintf("%s/%s.db", path, site)}) +// makeStore creates store for all sites +func makeStore(group StoreGroup, siteNames []string) (result engine.Interface, err error) { + switch group.Type { + case "bolt": + if err = makeDirs(group.Bolt.Path); err != nil { + return nil, err + } + sites := []engine.BoltSite{} + for _, site := range siteNames { + sites = append(sites, engine.BoltSite{SiteID: site, FileName: fmt.Sprintf("%s/%s.db", group.Bolt.Path, site)}) + } + result, err = engine.NewBoltDB(bolt.Options{Timeout: group.Bolt.Timeout}, sites...) + default: + return nil, errors.Errorf("unsupported store type %s", group.Type) } - result, err := engine.NewBoltDB(bolt.Options{Timeout: 30 * time.Second}, sites...) - if err != nil { - return nil, errors.Wrap(err, "can't initialize data store") - } - return result, nil + + return result, errors.Wrap(err, "can't initialize data store") } // mkdir -p for all dirs diff --git a/app/main_test.go b/app/main_test.go index 8e541701..ceba4218 100644 --- a/app/main_test.go +++ b/app/main_test.go @@ -49,7 +49,7 @@ func TestApplicationFailed(t *testing.T) { p := flags.NewParser(&opts, flags.Default) // RO bolt location - p.ParseArgs([]string{"--secret=123456", "--url=https://demo.remark42.com", "--bolt=/dev/null"}) + p.ParseArgs([]string{"--secret=123456", "--url=https://demo.remark42.com", "--store.bolt.path=/dev/null"}) _, err := New(opts) assert.EqualError(t, err, "can't initialize data store: failed to make boltdb for /dev/null/remark.db: "+ "open /dev/null/remark.db: not a directory") @@ -57,17 +57,24 @@ func TestApplicationFailed(t *testing.T) { // RO backup location opts = Opts{} - p.ParseArgs([]string{"--secret=123456", "--url=https://demo.remark42.com", "--bolt=/tmp", "--backup=/dev/null/not-writable"}) + p.ParseArgs([]string{"--secret=123456", "--url=https://demo.remark42.com", "--store.bolt.path=/tmp", + "--backup=/dev/null/not-writable"}) _, err = New(opts) assert.EqualError(t, err, "can't check directory status for /dev/null/not-writable: stat /dev/null/not-writable: not a directory") t.Log(err) // invalid url opts = Opts{} - p.ParseArgs([]string{"--secret=123456", "--url=demo.remark42.com", "--bolt=/tmp"}) + p.ParseArgs([]string{"--secret=123456", "--url=demo.remark42.com", "----store.bolt.path=/tmp"}) _, err = New(opts) assert.EqualError(t, err, "invalid remark42 url demo.remark42.com") t.Log(err) + + opts = Opts{} + p.ParseArgs([]string{"--secret=123456", "--url=https://demo.remark42.com", "--store.type=mongo"}) + _, err = New(opts) + assert.EqualError(t, err, "unsupported store type mongo") + t.Log(err) } func TestApplicationShutdown(t *testing.T) { @@ -79,7 +86,7 @@ func TestApplicationShutdown(t *testing.T) { } func TestApplicationMainSignal(t *testing.T) { - os.Args = []string{"test", "--secret=123456", "--bolt=/tmp/xyz", "--backup=/tmp", "--avatars=/tmp", + os.Args = []string{"test", "--secret=123456", "--store.bolt.path=/tmp/xyz", "--backup=/tmp", "--avatars=/tmp", "--port=18100", "--url=https://demo.remark42.com"} go func() { @@ -97,14 +104,15 @@ func prepApp(t *testing.T, port int, duration time.Duration) (*Application, cont p := flags.NewParser(&opts, flags.Default) p.ParseArgs([]string{"--secret=123456", "--dev-passwd=password", "--url=https://demo.remark42.com"}) opts.AvatarStore, opts.BackupLocation = "/tmp", "/tmp" - opts.BoltPath = fmt.Sprintf("/tmp/%d", port) + opts.Store.Bolt.Path = fmt.Sprintf("/tmp/%d", port) + opts.Store.Bolt.Timeout = 10 * time.Second opts.Auth.Github.CSEC, opts.Auth.Github.CID = "csec", "cid" opts.Auth.Google.CSEC, opts.Auth.Google.CID = "csec", "cid" opts.Auth.Facebook.CSEC, opts.Auth.Facebook.CID = "csec", "cid" opts.Auth.Yandex.CSEC, opts.Auth.Yandex.CID = "csec", "cid" opts.Port = port - os.Remove(opts.BoltPath + "/remark.db") + os.Remove(opts.Store.Bolt.Path + "/remark.db") // create app app, err := New(opts)