mirror of
https://github.com/aptly-dev/aptly.git
synced 2026-07-27 13:57:46 +00:00
Revert "Don't remove API file socket if it exists and it's usable"
See PR #807
Fixes: #849
This reverts commit 22848b010d.
This commit is contained in:
committed by
Andrey Smirnov
parent
94a72b23ff
commit
70cd11e30f
+1
-19
@@ -58,25 +58,7 @@ func aptlyAPIServe(cmd *commander.Command, args []string) error {
|
|||||||
listenURL, err := url.Parse(listen)
|
listenURL, err := url.Parse(listen)
|
||||||
if err == nil && listenURL.Scheme == "unix" {
|
if err == nil && listenURL.Scheme == "unix" {
|
||||||
file := listenURL.Path
|
file := listenURL.Path
|
||||||
|
os.Remove(file)
|
||||||
var stat os.FileInfo
|
|
||||||
stat, err = os.Stat(file)
|
|
||||||
shouldRemove := true
|
|
||||||
|
|
||||||
if err == nil && stat.Mode()&os.ModeSocket == os.ModeSocket {
|
|
||||||
shouldRemove = false
|
|
||||||
}
|
|
||||||
|
|
||||||
if err != nil && os.IsNotExist(err) {
|
|
||||||
shouldRemove = false
|
|
||||||
}
|
|
||||||
|
|
||||||
if shouldRemove {
|
|
||||||
err = os.Remove(file)
|
|
||||||
if err != nil {
|
|
||||||
fmt.Printf("Warning: error removing file %s: %s\n", file, err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
var listener net.Listener
|
var listener net.Listener
|
||||||
listener, err = net.Listen("unix", file)
|
listener, err = net.Listen("unix", file)
|
||||||
|
|||||||
Reference in New Issue
Block a user