aboutsummaryrefslogtreecommitdiff
path: root/go/weed/weed_server
diff options
context:
space:
mode:
Diffstat (limited to 'go/weed/weed_server')
-rw-r--r--go/weed/weed_server/common.go11
-rw-r--r--go/weed/weed_server/filer_server.go5
-rw-r--r--go/weed/weed_server/filer_server_handlers.go9
-rw-r--r--go/weed/weed_server/filer_server_handlers_admin.go3
-rw-r--r--go/weed/weed_server/master_server.go9
-rw-r--r--go/weed/weed_server/master_server_handlers.go7
-rw-r--r--go/weed/weed_server/master_server_handlers_admin.go13
-rw-r--r--go/weed/weed_server/raft_server.go9
-rw-r--r--go/weed/weed_server/raft_server_handlers.go7
-rw-r--r--go/weed/weed_server/volume_server.go5
-rw-r--r--go/weed/weed_server/volume_server_handlers.go13
-rw-r--r--go/weed/weed_server/volume_server_handlers_admin.go5
-rw-r--r--go/weed/weed_server/volume_server_handlers_vacuum.go3
13 files changed, 56 insertions, 43 deletions
diff --git a/go/weed/weed_server/common.go b/go/weed/weed_server/common.go
index 816107dc5..39b0830e3 100644
--- a/go/weed/weed_server/common.go
+++ b/go/weed/weed_server/common.go
@@ -2,11 +2,6 @@ package weed_server
import (
"bytes"
- "github.com/chrislusf/weed-fs/go/glog"
- "github.com/chrislusf/weed-fs/go/operation"
- "github.com/chrislusf/weed-fs/go/stats"
- "github.com/chrislusf/weed-fs/go/storage"
- "github.com/chrislusf/weed-fs/go/util"
"encoding/json"
"fmt"
"net"
@@ -14,6 +9,12 @@ import (
"path/filepath"
"strconv"
"strings"
+
+ "github.com/chrislusf/weed-fs/go/glog"
+ "github.com/chrislusf/weed-fs/go/operation"
+ "github.com/chrislusf/weed-fs/go/stats"
+ "github.com/chrislusf/weed-fs/go/storage"
+ "github.com/chrislusf/weed-fs/go/util"
)
var serverStats *stats.ServerStats
diff --git a/go/weed/weed_server/filer_server.go b/go/weed/weed_server/filer_server.go
index 5ff0ed986..9d6f7c71b 100644
--- a/go/weed/weed_server/filer_server.go
+++ b/go/weed/weed_server/filer_server.go
@@ -1,10 +1,11 @@
package weed_server
import (
- "github.com/chrislusf/weed-fs/go/filer"
- "github.com/chrislusf/weed-fs/go/glog"
"net/http"
"strconv"
+
+ "github.com/chrislusf/weed-fs/go/filer"
+ "github.com/chrislusf/weed-fs/go/glog"
)
type FilerServer struct {
diff --git a/go/weed/weed_server/filer_server_handlers.go b/go/weed/weed_server/filer_server_handlers.go
index e36e7c310..781d7c0fc 100644
--- a/go/weed/weed_server/filer_server_handlers.go
+++ b/go/weed/weed_server/filer_server_handlers.go
@@ -1,12 +1,8 @@
package weed_server
import (
- "github.com/chrislusf/weed-fs/go/glog"
- "github.com/chrislusf/weed-fs/go/operation"
- "github.com/chrislusf/weed-fs/go/util"
"encoding/json"
"errors"
- "github.com/syndtr/goleveldb/leveldb"
"io"
"io/ioutil"
"math/rand"
@@ -14,6 +10,11 @@ import (
"net/url"
"strconv"
"strings"
+
+ "github.com/chrislusf/weed-fs/go/glog"
+ "github.com/chrislusf/weed-fs/go/operation"
+ "github.com/chrislusf/weed-fs/go/util"
+ "github.com/syndtr/goleveldb/leveldb"
)
func (fs *FilerServer) filerHandler(w http.ResponseWriter, r *http.Request) {
diff --git a/go/weed/weed_server/filer_server_handlers_admin.go b/go/weed/weed_server/filer_server_handlers_admin.go
index ff52dff24..5ba12e0b8 100644
--- a/go/weed/weed_server/filer_server_handlers_admin.go
+++ b/go/weed/weed_server/filer_server_handlers_admin.go
@@ -1,8 +1,9 @@
package weed_server
import (
- "github.com/chrislusf/weed-fs/go/glog"
"net/http"
+
+ "github.com/chrislusf/weed-fs/go/glog"
)
/*
diff --git a/go/weed/weed_server/master_server.go b/go/weed/weed_server/master_server.go
index 401f6cfdb..d000cb610 100644
--- a/go/weed/weed_server/master_server.go
+++ b/go/weed/weed_server/master_server.go
@@ -1,16 +1,17 @@
package weed_server
import (
+ "net/http"
+ "net/http/httputil"
+ "net/url"
+ "sync"
+
"github.com/chrislusf/weed-fs/go/glog"
"github.com/chrislusf/weed-fs/go/sequence"
"github.com/chrislusf/weed-fs/go/topology"
"github.com/chrislusf/weed-fs/go/util"
"github.com/goraft/raft"
"github.com/gorilla/mux"
- "net/http"
- "net/http/httputil"
- "net/url"
- "sync"
)
type MasterServer struct {
diff --git a/go/weed/weed_server/master_server_handlers.go b/go/weed/weed_server/master_server_handlers.go
index d7f1f4ce3..7a7a3b70d 100644
--- a/go/weed/weed_server/master_server_handlers.go
+++ b/go/weed/weed_server/master_server_handlers.go
@@ -1,12 +1,13 @@
package weed_server
import (
- "github.com/chrislusf/weed-fs/go/operation"
- "github.com/chrislusf/weed-fs/go/stats"
- "github.com/chrislusf/weed-fs/go/storage"
"net/http"
"strconv"
"strings"
+
+ "github.com/chrislusf/weed-fs/go/operation"
+ "github.com/chrislusf/weed-fs/go/stats"
+ "github.com/chrislusf/weed-fs/go/storage"
)
func (ms *MasterServer) lookupVolumeId(vids []string, collection string) (volumeLocations map[string]operation.LookupResult) {
diff --git a/go/weed/weed_server/master_server_handlers_admin.go b/go/weed/weed_server/master_server_handlers_admin.go
index 1a2c6b8e0..d7124e567 100644
--- a/go/weed/weed_server/master_server_handlers_admin.go
+++ b/go/weed/weed_server/master_server_handlers_admin.go
@@ -1,18 +1,19 @@
package weed_server
import (
- proto "code.google.com/p/goprotobuf/proto"
- "github.com/chrislusf/weed-fs/go/glog"
- "github.com/chrislusf/weed-fs/go/operation"
- "github.com/chrislusf/weed-fs/go/storage"
- "github.com/chrislusf/weed-fs/go/topology"
- "github.com/chrislusf/weed-fs/go/util"
"encoding/json"
"errors"
"io/ioutil"
"net/http"
"strconv"
"strings"
+
+ proto "code.google.com/p/goprotobuf/proto"
+ "github.com/chrislusf/weed-fs/go/glog"
+ "github.com/chrislusf/weed-fs/go/operation"
+ "github.com/chrislusf/weed-fs/go/storage"
+ "github.com/chrislusf/weed-fs/go/topology"
+ "github.com/chrislusf/weed-fs/go/util"
)
func (ms *MasterServer) collectionDeleteHandler(w http.ResponseWriter, r *http.Request) {
diff --git a/go/weed/weed_server/raft_server.go b/go/weed/weed_server/raft_server.go
index e41867076..0b049ce27 100644
--- a/go/weed/weed_server/raft_server.go
+++ b/go/weed/weed_server/raft_server.go
@@ -2,19 +2,20 @@ package weed_server
import (
"bytes"
- "github.com/chrislusf/weed-fs/go/glog"
- "github.com/chrislusf/weed-fs/go/topology"
"encoding/json"
"errors"
"fmt"
- "github.com/goraft/raft"
- "github.com/gorilla/mux"
"io/ioutil"
"math/rand"
"net/http"
"net/url"
"strings"
"time"
+
+ "github.com/chrislusf/weed-fs/go/glog"
+ "github.com/chrislusf/weed-fs/go/topology"
+ "github.com/goraft/raft"
+ "github.com/gorilla/mux"
)
type RaftServer struct {
diff --git a/go/weed/weed_server/raft_server_handlers.go b/go/weed/weed_server/raft_server_handlers.go
index 4d51c0767..b466d9afa 100644
--- a/go/weed/weed_server/raft_server_handlers.go
+++ b/go/weed/weed_server/raft_server_handlers.go
@@ -1,13 +1,14 @@
package weed_server
import (
- "github.com/chrislusf/weed-fs/go/glog"
- "github.com/chrislusf/weed-fs/go/operation"
"encoding/json"
- "github.com/goraft/raft"
"io/ioutil"
"net/http"
"strings"
+
+ "github.com/chrislusf/weed-fs/go/glog"
+ "github.com/chrislusf/weed-fs/go/operation"
+ "github.com/goraft/raft"
)
// Handles incoming RAFT joins.
diff --git a/go/weed/weed_server/volume_server.go b/go/weed/weed_server/volume_server.go
index 2a9085f3b..0a65fd2f6 100644
--- a/go/weed/weed_server/volume_server.go
+++ b/go/weed/weed_server/volume_server.go
@@ -1,12 +1,13 @@
package weed_server
import (
- "github.com/chrislusf/weed-fs/go/glog"
- "github.com/chrislusf/weed-fs/go/storage"
"math/rand"
"net/http"
"strconv"
"time"
+
+ "github.com/chrislusf/weed-fs/go/glog"
+ "github.com/chrislusf/weed-fs/go/storage"
)
type VolumeServer struct {
diff --git a/go/weed/weed_server/volume_server_handlers.go b/go/weed/weed_server/volume_server_handlers.go
index ce14f6a87..83f614941 100644
--- a/go/weed/weed_server/volume_server_handlers.go
+++ b/go/weed/weed_server/volume_server_handlers.go
@@ -1,12 +1,6 @@
package weed_server
import (
- "github.com/chrislusf/weed-fs/go/glog"
- "github.com/chrislusf/weed-fs/go/images"
- "github.com/chrislusf/weed-fs/go/operation"
- "github.com/chrislusf/weed-fs/go/stats"
- "github.com/chrislusf/weed-fs/go/storage"
- "github.com/chrislusf/weed-fs/go/topology"
"io"
"mime"
"mime/multipart"
@@ -14,6 +8,13 @@ import (
"strconv"
"strings"
"time"
+
+ "github.com/chrislusf/weed-fs/go/glog"
+ "github.com/chrislusf/weed-fs/go/images"
+ "github.com/chrislusf/weed-fs/go/operation"
+ "github.com/chrislusf/weed-fs/go/stats"
+ "github.com/chrislusf/weed-fs/go/storage"
+ "github.com/chrislusf/weed-fs/go/topology"
)
var fileNameEscaper = strings.NewReplacer("\\", "\\\\", "\"", "\\\"")
diff --git a/go/weed/weed_server/volume_server_handlers_admin.go b/go/weed/weed_server/volume_server_handlers_admin.go
index 1118c8017..caf4c3be8 100644
--- a/go/weed/weed_server/volume_server_handlers_admin.go
+++ b/go/weed/weed_server/volume_server_handlers_admin.go
@@ -1,11 +1,12 @@
package weed_server
import (
+ "net/http"
+ "path/filepath"
+
"github.com/chrislusf/weed-fs/go/glog"
"github.com/chrislusf/weed-fs/go/stats"
"github.com/chrislusf/weed-fs/go/util"
- "net/http"
- "path/filepath"
)
func (vs *VolumeServer) statusHandler(w http.ResponseWriter, r *http.Request) {
diff --git a/go/weed/weed_server/volume_server_handlers_vacuum.go b/go/weed/weed_server/volume_server_handlers_vacuum.go
index b0600d799..f115e3b8b 100644
--- a/go/weed/weed_server/volume_server_handlers_vacuum.go
+++ b/go/weed/weed_server/volume_server_handlers_vacuum.go
@@ -1,8 +1,9 @@
package weed_server
import (
- "github.com/chrislusf/weed-fs/go/glog"
"net/http"
+
+ "github.com/chrislusf/weed-fs/go/glog"
)
func (vs *VolumeServer) vacuumVolumeCheckHandler(w http.ResponseWriter, r *http.Request) {
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-24 21:05:30 +0000