Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,5 @@ docs/_build
*.deb
goiardi-*
packaging/**/share/goiardi/*
/.idea
index.bin
3 changes: 2 additions & 1 deletion client/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,15 @@ import (
"database/sql"
"encoding/gob"
"fmt"
"net/http"

"github.com/ctdk/chefcrypto"
"github.com/ctdk/goiardi/config"
"github.com/ctdk/goiardi/datastore"
"github.com/ctdk/goiardi/indexer"
"github.com/ctdk/goiardi/secret"
"github.com/ctdk/goiardi/util"
"github.com/tideland/golib/logger"
"net/http"
)

// A Client and a user are very similar, with some small differences - users
Expand Down
15 changes: 13 additions & 2 deletions client/sql_funcs.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,12 @@ package client
import (
"database/sql"
"fmt"
"github.com/ctdk/goiardi/config"
"github.com/ctdk/goiardi/datastore"
"log"
"strings"

"github.com/ctdk/goiardi/config"
"github.com/ctdk/goiardi/datastore"
"github.com/ctdk/goiardi/util"
)

func checkForClientSQL(dbhandle datastore.Dbhandle, name string) (bool, error) {
Expand Down Expand Up @@ -216,3 +218,12 @@ func allClientsSQL() []*Client {
}
return clients
}

// Count returns a count of all clients on this server.
func Count() int64 {
if config.UsingDB() {
c, _ := util.CountSQL("clients")
return c
}
return int64(len(GetList()))
}
304 changes: 166 additions & 138 deletions config/config.go

Large diffs are not rendered by default.

Loading