Commit 6f05794b authored by Matthew Holt's avatar Matthew Holt

git: Fixed unusual but potent race condition

parent 346135fe
...@@ -82,7 +82,7 @@ func TLS(c *Controller) (middleware.Middleware, error) { ...@@ -82,7 +82,7 @@ func TLS(c *Controller) (middleware.Middleware, error) {
} }
// Map of supported protocols // Map of supported protocols
// SSLv3 will be not supported in next release // SSLv3 will be not supported in future release
// HTTP/2 only supports TLS 1.2 and higher // HTTP/2 only supports TLS 1.2 and higher
var supportedProtocols = map[string]uint16{ var supportedProtocols = map[string]uint16{
"ssl3.0": tls.VersionSSL30, "ssl3.0": tls.VersionSSL30,
......
...@@ -62,8 +62,9 @@ type Repo struct { ...@@ -62,8 +62,9 @@ type Repo struct {
func (r *Repo) Pull() error { func (r *Repo) Pull() error {
r.Lock() r.Lock()
defer r.Unlock() defer r.Unlock()
// if it is less than interval since last pull, return
if time.Since(r.lastPull) <= r.Interval { // prevent a pull if the last one was less than 5 seconds ago
if time.Since(r.lastPull) < 5*time.Second {
return nil return nil
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment