start reworking upload handler

Author: tcolgate

governor.go

@@ -2,6 +2,8 @@ package main
 
 import (
 	"errors"
+	"log"
+	"runtime/debug"
 	"sync"
 )
 
@@ -34,6 +36,8 @@ func NewGovernor(max int) *Governor {
 
 // ReadLock takes a read lock on this governor
 func (g *Governor) ReadLock() {
+	log.Println("read loccked")
+	debug.PrintStack()
 	if g.Max != 0 {
 		_ = <-g.reqs
 	}
@@ -42,6 +46,8 @@ func (g *Governor) ReadLock() {
 
 // ReadUnLock releases a read lock
 func (g *Governor) ReadUnLock() {
+	log.Println("read unloccked")
+	debug.PrintStack()
 	g.rwLock.RUnlock()
 	if g.Max != 0 {
 		g.reqs <- req{}
@@ -51,6 +57,9 @@ func (g *Governor) ReadUnLock() {
 // WriteLock takes a write lock. THis shoudl block  until all readers
 // are complete
 func (g *Governor) WriteLock() {
+	log.Println("write loccked")
+	debug.PrintStack()
+
 	if g.Max != 0 {
 		for i := 0; i < g.Max; i++ {
 			_ = <-g.reqs
@@ -61,6 +70,8 @@ func (g *Governor) WriteLock() {
 
 // WriteUnLock releases the write lock
 func (g *Governor) WriteUnLock() (err error) {
+	log.Println("write unloccked")
+	debug.PrintStack()
 	g.rwLock.Unlock()
 	if g.Max != 0 {
 		if len(g.reqs) != 0 {

server_cli.go

@@ -96,7 +96,6 @@ func CmdServe(c *cli.Context) {
 	r.Handle("/debug/vars", http.DefaultServeMux)
 
 	r.PathPrefix("/repo/").Handler(appHandler(makeHTTPDownloadHandler()))
-	r.PathPrefix("/upload").Handler(appHandler(httpUploadHandler))
 
 	r.Handle("/dists", appHandler(httpDistsHandler))
 	r.Handle("/dists/{name}", appHandler(httpDistsHandler))

upload_session.go

@@ -53,7 +53,6 @@ type UploadSession struct {
 	// TODO revisit this
 	incoming  chan addItemMsg   // New item upload requests
 	getstatus chan getStatusMsg // A channel for responding to status requests
-	geterr    chan getStatusMsg // A channel for responding to status requests
 }
 
 // ID returns the ID of this session
@@ -169,8 +168,7 @@ func (s *UploadSession) handler(ctx context.Context, cancel context.CancelFunc)
 			}
 		case msg := <-s.incoming:
 			{
-				if err := s.doAddFile(msg.file); err != nil {
-					s.err = err
+				if s.err = s.doAddFile(msg.file); s.err != nil {
 					msg.resp <- *s
 					break
 				}
@@ -189,15 +187,8 @@ func (s *UploadSession) handler(ctx context.Context, cancel context.CancelFunc)
 					s.Complete = true
 				}
 
-				if err := s.usm.MergeSession(s); err != nil {
-					log.Println(err)
-				}
-
-				// cancel the context
-				cancel()
-
-				// Need to do the update and return the response
-				return
+				s.usm.MergeSession(s)
+				msg.resp <- *s
 			}
 		}
 	}
@@ -402,7 +393,7 @@ func (s *UploadSession) doAddFile(upload *UploadFile) (err error) {
 // and placing it in the archive store.
 func (s *UploadSession) Err() error {
 	c := make(chan UploadSession)
-	s.geterr <- getStatusMsg{
+	s.getstatus <- getStatusMsg{
 		resp: c,
 	}
 	status := <-c