grim/hgkeeper

Add support for disabling either the HTTP or SSH serves in the serve command

2021-12-05, Gary Kramlich
67d976e7c7d1
Parents b3b134a272ad
Children f0d4e9da6a1a
Add support for disabling either the HTTP or SSH serves in the serve command
1 files changed, 42 insertions(+), 18 deletions(-)
  • +42 -18
    serve/command.go
    • --- a/serve/command.go Thu Oct 28 06:18:36 2021 -0500
    +++ b/serve/command.go Sun Dec 05 03:25:10 2021 -0600
    @@ -1,6 +1,7 @@
    package serve
    import (
    + "fmt"
    "os"
    "os/signal"
    "syscall"
    @@ -18,9 +19,15 @@
    SSHHostKeysPath string `kong:"flag,name='ssh-host-keys-path',env='HGK_SSH_HOST_KEYS_PATH',short='H',help='the path where host keys are kept',default='host-keys'"`
    HTTPAddr string `kong:"flag,name='http-listen-addr',env='HGK_HTTP_LISTEN_ADDR',help='what address the http server listens on',default=':8080'"`
    CacheSize int `kong:"flag,name='cache-size',env='HGK_HTTP_CACHE_SIZE',help='number of pages to cache',default='1000'"`
    + DisableSSH bool `kong:"flag,name='disable-ssh',env='HGK_DISABLE_SSH',help='disable the SSH server',default='false'"`
    + DisableHTTP bool `kong:"flag,name='disable-http',env='HGK_DISABLE_HTTP',help='disable the HTTP server',default='false'"`
    }
    func (c *Command) Run(g *globals.Globals) error {
    + if c.DisableHTTP && c.DisableSSH {
    + return fmt.Errorf("both HTTP and SSH servers have been disabled")
    + }
    +
    if err := access.Setup(g.ReposPath, g.AdminRepo); err != nil {
    return err
    }
    @@ -31,29 +38,46 @@
    errChan := make(chan error, 10)
    - ssh, err := ssh.NewServer(c.SSHHostKeysPath, g.ReposPath, access.AdminRepoPath())
    - if err != nil {
    - return err
    - }
    - defer ssh.Close()
    + var sshServer *ssh.Server
    + var hgwebServer *hgweb.Server
    - hgweb, err := hgweb.NewServer(c.HTTPAddr, c.CacheSize)
    - if err != nil {
    - return err
    + if c.DisableSSH {
    + log.Info("SSH server has been disabled")
    + } else {
    + var err error
    + sshServer, err = ssh.NewServer(c.SSHHostKeysPath, g.ReposPath, access.AdminRepoPath())
    + if err != nil {
    + return err
    + }
    + defer sshServer.Close()
    }
    - defer hgweb.Close()
    - go func() {
    - if err := ssh.Listen(c.SSHAddr); err != nil {
    - errChan <- err
    + if c.DisableHTTP {
    + log.Info("HTTP server has been disabled")
    + } else {
    + var err error
    + hgwebServer, err = hgweb.NewServer(c.HTTPAddr, c.CacheSize)
    + if err != nil {
    + return err
    }
    - }()
    + defer hgwebServer.Close()
    + }
    - go func() {
    - if err := hgweb.Listen(); err != nil {
    - errChan <- err
    - }
    - }()
    + if !c.DisableSSH {
    + go func() {
    + if err := sshServer.Listen(c.SSHAddr); err != nil {
    + errChan <- err
    + }
    + }()
    + }
    +
    + if !c.DisableHTTP {
    + go func() {
    + if err := hgwebServer.Listen(); err != nil {
    + errChan <- err
    + }
    + }()
    + }
    for {
    select {