aboutsummaryrefslogtreecommitdiff
path: root/go
diff options
context:
space:
mode:
Diffstat (limited to 'go')
-rw-r--r--go/filer/filer.go2
-rw-r--r--go/images/preprocess.go2
-rw-r--r--go/weed/benchmark.go6
-rw-r--r--go/weed/fix.go2
-rw-r--r--go/weed/mount.go8
-rw-r--r--go/weed/mount_std.go2
-rw-r--r--go/weed/version.go4
-rw-r--r--go/weed/weed.go2
-rw-r--r--go/weed/weed_server/master_ui/templates.go4
-rw-r--r--go/weed/weed_server/volume_server_ui/templates.go4
10 files changed, 18 insertions, 18 deletions
diff --git a/go/filer/filer.go b/go/filer/filer.go
index 5a2584c4a..fd23e119c 100644
--- a/go/filer/filer.go
+++ b/go/filer/filer.go
@@ -1,6 +1,6 @@
package filer
-type FileId string //file id on weedfs
+type FileId string //file id in SeaweedFS
type FileEntry struct {
Name string `json:"name,omitempty"` //file name without path
diff --git a/go/images/preprocess.go b/go/images/preprocess.go
index e5c6dee8c..0d6cb2d9e 100644
--- a/go/images/preprocess.go
+++ b/go/images/preprocess.go
@@ -10,7 +10,7 @@ import (
* 1. possibly adjust the orientation
* 2. resize the image to a width or height limit
* 3. remove the exif data
-* Call this function on any file uploaded to weedfs
+* Call this function on any file uploaded to SeaweedFS
*
*/
func MaybePreprocessImage(filename string, data []byte, width, height int) (resized []byte, w int, h int) {
diff --git a/go/weed/benchmark.go b/go/weed/benchmark.go
index 2e9872563..0529a1e52 100644
--- a/go/weed/benchmark.go
+++ b/go/weed/benchmark.go
@@ -46,7 +46,7 @@ var (
func init() {
cmdBenchmark.Run = runbenchmark // break init cycle
cmdBenchmark.IsDebug = cmdBenchmark.Flag.Bool("debug", false, "verbose debug information")
- b.server = cmdBenchmark.Flag.String("server", "localhost:9333", "weedfs master location")
+ b.server = cmdBenchmark.Flag.String("server", "localhost:9333", "SeaweedFS master location")
b.concurrency = cmdBenchmark.Flag.Int("c", 16, "number of concurrent write or read processes")
b.fileSize = cmdBenchmark.Flag.Int("size", 1024, "simulated file size in bytes, with random(0~63) bytes padding")
b.numberOfFiles = cmdBenchmark.Flag.Int("n", 1024*1024, "number of files to write for each thread")
@@ -66,7 +66,7 @@ func init() {
var cmdBenchmark = &Command{
UsageLine: "benchmark -server=localhost:9333 -c=10 -n=100000",
Short: "benchmark on writing millions of files and read out",
- Long: `benchmark on an empty weed file system.
+ Long: `benchmark on an empty SeaweedFS file system.
Two tests during benchmark:
1) write lots of small files to the system
@@ -102,7 +102,7 @@ var (
)
func runbenchmark(cmd *Command, args []string) bool {
- fmt.Printf("This is Seaweed File System version %s %s %s\n", util.VERSION, runtime.GOOS, runtime.GOARCH)
+ fmt.Printf("This is SeaweedFS version %s %s %s\n", util.VERSION, runtime.GOOS, runtime.GOARCH)
if *b.maxCpu < 1 {
*b.maxCpu = runtime.NumCPU()
}
diff --git a/go/weed/fix.go b/go/weed/fix.go
index 5fb933ba3..f0fdbe7aa 100644
--- a/go/weed/fix.go
+++ b/go/weed/fix.go
@@ -16,7 +16,7 @@ func init() {
var cmdFix = &Command{
UsageLine: "fix -dir=/tmp -volumeId=234",
Short: "run weed tool fix on index file if corrupted",
- Long: `Fix runs the SeeweedFS fix command to re-create the index .idx file.
+ Long: `Fix runs the SeaweedFS fix command to re-create the index .idx file.
`,
}
diff --git a/go/weed/mount.go b/go/weed/mount.go
index 66e645387..de7a3b8c3 100644
--- a/go/weed/mount.go
+++ b/go/weed/mount.go
@@ -12,17 +12,17 @@ var (
func init() {
cmdMount.Run = runMount // break init cycle
cmdMount.IsDebug = cmdMount.Flag.Bool("debug", false, "verbose debug information")
- mountOptions.filer = cmdMount.Flag.String("filer", "localhost:8888", "weedfs filer location")
+ mountOptions.filer = cmdMount.Flag.String("filer", "localhost:8888", "weed filer location")
mountOptions.dir = cmdMount.Flag.String("dir", "", "mount weed filer to this directory")
}
var cmdMount = &Command{
UsageLine: "mount -filer=localhost:8888 -dir=/some/dir",
Short: "mount weed filer to a directory as file system in userspace(FUSE)",
- Long: `mount weed file system to userspace.
-
+ Long: `mount weed filer to userspace.
+
Pre-requisites:
- 1) have a weed file system running
+ 1) have SeaweedFS master and volume servers running
2) have a "weed filer" running
These 2 requirements can be achieved with one command "weed server -filer=true"
diff --git a/go/weed/mount_std.go b/go/weed/mount_std.go
index e92957ca9..97b73e672 100644
--- a/go/weed/mount_std.go
+++ b/go/weed/mount_std.go
@@ -16,7 +16,7 @@ import (
)
func runMount(cmd *Command, args []string) bool {
- fmt.Printf("This is Seaweed File System version %s %s %s\n", util.VERSION, runtime.GOOS, runtime.GOARCH)
+ fmt.Printf("This is SeaweedFS version %s %s %s\n", util.VERSION, runtime.GOOS, runtime.GOARCH)
if *mountOptions.dir == "" {
fmt.Printf("Please specify the mount directory via \"-dir\"")
return false
diff --git a/go/weed/version.go b/go/weed/version.go
index bca339281..8fef546f4 100644
--- a/go/weed/version.go
+++ b/go/weed/version.go
@@ -10,8 +10,8 @@ import (
var cmdVersion = &Command{
Run: runVersion,
UsageLine: "version",
- Short: "print Seaweed File System version",
- Long: `Version prints the Seaweed File System version`,
+ Short: "print SeaweedFS version",
+ Long: `Version prints the SeaweedFS version`,
}
func runVersion(cmd *Command, args []string) bool {
diff --git a/go/weed/weed.go b/go/weed/weed.go
index dcbe45422..b3dd61616 100644
--- a/go/weed/weed.go
+++ b/go/weed/weed.go
@@ -91,7 +91,7 @@ func main() {
}
var usageTemplate = `
-Seaweed File System : store billions of files and serve them fast!
+SeaweedFS: store billions of files and serve them fast!
Usage:
diff --git a/go/weed/weed_server/master_ui/templates.go b/go/weed/weed_server/master_ui/templates.go
index fb297398b..a4c6235ba 100644
--- a/go/weed/weed_server/master_ui/templates.go
+++ b/go/weed/weed_server/master_ui/templates.go
@@ -7,13 +7,13 @@ import (
var StatusTpl = template.Must(template.New("status").Parse(`<!DOCTYPE html>
<html>
<head>
- <title>Seaweed File System {{ .Version }}</title>
+ <title>SeaweedFS {{ .Version }}</title>
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.1/css/bootstrap.min.css">
</head>
<body>
<div class="container">
<div class="page-header">
- <h1>Seaweed File System <small>{{ .Version }}</small></h1>
+ <h1>SeaweedFS <small>{{ .Version }}</small></h1>
</div>
<div class="row">
diff --git a/go/weed/weed_server/volume_server_ui/templates.go b/go/weed/weed_server/volume_server_ui/templates.go
index ce51ab4f8..bdc3a16dc 100644
--- a/go/weed/weed_server/volume_server_ui/templates.go
+++ b/go/weed/weed_server/volume_server_ui/templates.go
@@ -21,7 +21,7 @@ var funcMap = template.FuncMap{
var StatusTpl = template.Must(template.New("status").Funcs(funcMap).Parse(`<!DOCTYPE html>
<html>
<head>
- <title>Seaweed File System {{ .Version }}</title>
+ <title>SeaweedFS {{ .Version }}</title>
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.1/css/bootstrap.min.css">
<script type="text/javascript" src="https://code.jquery.com/jquery-2.1.3.min.js"></script>
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jquery-sparklines/2.1.2/jquery.sparkline.min.js"></script>
@@ -48,7 +48,7 @@ var StatusTpl = template.Must(template.New("status").Funcs(funcMap).Parse(`<!DOC
<body>
<div class="container">
<div class="page-header">
- <h1>Seaweed File System <small>{{ .Version }}</small></h1>
+ <h1>SeaweedFS <small>{{ .Version }}</small></h1>
</div>
<div class="row">