Skip to content

Commit ab6002b

Browse files
authored
Merge pull request #232 from carlosms/optional-dirs
Make repo directories optional for server cmd
2 parents d4180c9 + 20d2a19 commit ab6002b

File tree

1 file changed

+16
-6
lines changed

1 file changed

+16
-6
lines changed

cmd/gitbase/server.go

+16-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package main
22

33
import (
4+
"errors"
45
"net"
56
"os"
67
"strconv"
@@ -41,17 +42,26 @@ func (c *cmdServer) buildDatabase() error {
4142
c.engine = sqle.New()
4243
}
4344

44-
if c.Git != "" {
45-
logrus.WithField("dir", c.Git).Debug("added folder containing git repositories")
45+
if c.Git == "" && c.Siva == "" {
46+
return errors.New("missing git or siva directories")
4647
}
4748

4849
c.pool = gitbase.NewRepositoryPool()
49-
if err := c.pool.AddDir(c.Git); err != nil {
50-
return err
50+
51+
if c.Git != "" {
52+
logrus.WithField("dir", c.Git).Debug("added folder containing git repositories")
53+
54+
if err := c.pool.AddDir(c.Git); err != nil {
55+
return err
56+
}
5157
}
5258

53-
if err := c.pool.AddSivaDir(c.Siva); err != nil {
54-
return err
59+
if c.Siva != "" {
60+
logrus.WithField("dir", c.Siva).Debug("added folder containing siva repositories")
61+
62+
if err := c.pool.AddSivaDir(c.Siva); err != nil {
63+
return err
64+
}
5565
}
5666

5767
c.engine.AddDatabase(gitbase.NewDatabase(c.name))

0 commit comments

Comments
 (0)