Added Makefile -- gofmt

pull/1/head
KatolaZ 8 years ago
parent 726b399e47
commit 74f8a74ecf
  1. 18
      Makefile
  2. 1
      commits.go
  3. 1
      config.go
  4. 6
      scorsh.go
  5. 4
      spooler.go
  6. 4
      types.go
  7. 1
      workers.go

@ -0,0 +1,18 @@
BUILD=go build
SOURCES=scorsh.go \
types.go \
config.go \
spooler.go \
commits.go \
workers.go
all: scorsh
scorsh: $(SOURCES)
$(BUILD) scorsh.go types.go config.go spooler.go commits.go workers.go
clean:
rm scorsh

@ -45,7 +45,6 @@ func check_signature(commit *git.Commit, keys []*openpgp.KeyRing) (signature, si
return "", "", err
}
// traverse all the commits between two references, looking for scorsh
// commands
// fixme: we don't have just one keyring here....

@ -59,4 +59,3 @@ func ReadGlobalConfig(fname string) *SCORSHmaster {
return cfg
}

@ -12,7 +12,6 @@ const debug debugging = true
type debugging bool
func (d debugging) log(format string, args ...interface{}) {
if d {
log.Printf(format, args...)
@ -45,7 +44,6 @@ func SCORSHerr(err int) error {
}
func FindMatchingWorkers(master *SCORSHmaster, msg *SCORSHmsg) []*SCORSHworker {
var ret []*SCORSHworker
@ -59,7 +57,6 @@ func FindMatchingWorkers(master *SCORSHmaster, msg *SCORSHmsg) []*SCORSHworker {
return ret
}
func Master(master *SCORSHmaster) {
// master main loop:
@ -97,14 +94,12 @@ func InitMaster() *SCORSHmaster {
master := ReadGlobalConfig(*conf_file)
master.Repos = make(map[string][]*SCORSHworker)
master.WorkingMsg = make(map[string]int)
// This is the mutex-channel on which we receive acks from workers
master.StatusChan = make(chan SCORSHmsg, 1)
master.Spooler = make(chan SCORSHmsg, 1)
err_workers := StartWorkers(master)
if err_workers != nil {
log.Fatal("Error starting workers: ", err_workers)
@ -119,7 +114,6 @@ func InitMaster() *SCORSHmaster {
}
func main() {
flag.Parse()

@ -12,7 +12,6 @@ import (
// parse a request file and return a SCORSHmessage
func parse_request(fname string, msg *SCORSHmsg) error {
debug.log("[parse_request] message at start: %s\n", msg)
data, err := ioutil.ReadFile(fname)
@ -25,7 +24,6 @@ func parse_request(fname string, msg *SCORSHmsg) error {
debug.log("[parse_request] reading message from file: %s\n", fname)
err = yaml.Unmarshal([]byte(data), msg)
if err != nil {
return fmt.Errorf("Error parsing message: %s", err)
@ -34,7 +32,6 @@ func parse_request(fname string, msg *SCORSHmsg) error {
return nil
}
func spooler(watcher *fsnotify.Watcher, worker chan SCORSHmsg) {
log.Println("Spooler started correctly")
@ -61,7 +58,6 @@ func spooler(watcher *fsnotify.Watcher, worker chan SCORSHmsg) {
}
}
func StartSpooler(master *SCORSHmaster) error {
watcher, err := fsnotify.NewWatcher()

@ -82,8 +82,6 @@ type SCORSHmaster struct {
SCORSHmaster_state
}
func (cfg *SCORSHmaster) String() string {
var buff bytes.Buffer
@ -122,7 +120,6 @@ func (cfg *SCORSHmaster) String() string {
return buff.String()
}
func (msg *SCORSHmsg) String() string {
var buff bytes.Buffer
@ -139,4 +136,3 @@ func (msg *SCORSHmsg) String() string {
return buff.String()
}

@ -64,7 +64,6 @@ func (w *SCORSHworker) LoadTags() error {
return fmt.Errorf("Cannot read worker config: %s", err)
}
err = yaml.Unmarshal(w_tags, w)
//err = yaml.Unmarshal(w_tags, tags)

Loading…
Cancel
Save