added git SHA to version

This commit is contained in:
Todd Gruben 2014-04-29 11:53:39 -05:00
parent 3cffcb2ed8
commit 0146b2f229
4 changed files with 12 additions and 5 deletions

View file

@ -4,13 +4,19 @@ import (
"flag"
"log"
"os"
"pilosa/core"
"pilosa/cruncher"
"runtime/pprof"
)
var cpuprofile = flag.String("cpuprofile", "", "write cpu profile to file")
var (
cpuprofile = flag.String("cpuprofile", "", "write cpu profile to file")
Build string
)
func main() {
core.Build = Build
flag.Parse()
if *cpuprofile != "" {
f, err := os.Create(*cpuprofile)

View file

@ -35,6 +35,8 @@ type Service struct {
name string
}
var Build string
func NewService() *Service {
service := new(Service)
service.init_id()
@ -48,7 +50,7 @@ func NewService() *Service {
service.WebService = NewWebService(service)
service.Index = index.NewFragmentContainer()
service.Hold = hold.NewHolder()
service.version = "0.0.25"
service.version = Build
service.name = "Cruncher"
service.PrepareLogging()
fmt.Printf("Pilosa %s\n", service.version)

View file

@ -313,12 +313,12 @@ func (self *Brand) Persist() error {
asize := len(self.bitmap_cache)
if asize == 0 {
log.Println("Nothing to save %s", self.getFileName())
log.Println("Nothing to save ", self.getFileName())
return nil
}
w, err := util.Create(self.getFileName())
if err != nil {
log.Println("Error opening outfile %s", self.getFileName())
log.Println("Error opening outfile ", self.getFileName())
log.Println(err)
return err
}

View file

@ -252,7 +252,6 @@ func getStorage(db string, slice int, frame string, fid SUUID) Storage {
}
return NewCassStorage(hosts, keyspace)
}
return nil
}
func NewFragment(frag_id SUUID, db string, slice int, frame string) *Fragment {