3 files changed, 100 insertions, 17 deletions
diff --git a/weed/command/command.go b/weed/command/command.go
index c451936e5..c6b005dd9 100644
--- a/weed/command/command.go
+++ b/weed/command/command.go
@@ -16,6 +16,7 @@ var Commands = []*Command{
 	cmdServer,
 	cmdMaster,
 	cmdFiler,
+	cmdS3,
 	cmdUpload,
 	cmdDownload,
 	cmdShell,
diff --git a/weed/command/mount_std.go b/weed/command/mount_std.go
index 4905df986..fda15090f 100644
--- a/weed/command/mount_std.go
+++ b/weed/command/mount_std.go
@@ -53,27 +53,14 @@ func runMount(cmd *Command, args []string) bool {
 		c.Close()
 	})
 
-	hostnameAndPort := strings.Split(*mountOptions.filer, ":")
-	if len(hostnameAndPort) != 2 {
-		fmt.Printf("The filer should have hostname:port format: %v\n", hostnameAndPort)
-		return false
-	}
-
-	filerPort, parseErr := strconv.ParseUint(hostnameAndPort[1], 10, 64)
-	if parseErr != nil {
-		fmt.Printf("The filer filer port parse error: %v\n", parseErr)
+	filerGrpcAddress, err := parseFilerGrpcAddress(*mountOptions.filer, *mountOptions.filerGrpcPort)
+	if err != nil {
+		glog.Fatal(err)
 		return false
 	}
 
-	filerGrpcPort := filerPort + 10000
-	if *mountOptions.filerGrpcPort != 0 {
-		filerGrpcPort = uint64(*copy.filerGrpcPort)
-	}
-
-	filerAddress := fmt.Sprintf("%s:%d", hostnameAndPort[0], filerGrpcPort)
-
 	err = fs.Serve(c, filesys.NewSeaweedFileSystem(
-		filerAddress, *mountOptions.filerMountRootPath, *mountOptions.collection, *mountOptions.replication, int32(*mountOptions.ttlSec),
+		filerGrpcAddress, *mountOptions.filerMountRootPath, *mountOptions.collection, *mountOptions.replication, int32(*mountOptions.ttlSec),
 		*mountOptions.chunkSizeLimitMB, *mountOptions.dataCenter))
 	if err != nil {
 		fuse.Unmount(*mountOptions.dir)
@@ -87,3 +74,22 @@ func runMount(cmd *Command, args []string) bool {
 
 	return true
 }
+
+func parseFilerGrpcAddress(filer string, optionalGrpcPort int) (filerGrpcAddress string, err error) {
+	hostnameAndPort := strings.Split(filer, ":")
+	if len(hostnameAndPort) != 2 {
+		return "", fmt.Errorf("The filer should have hostname:port format: %v", hostnameAndPort)
+	}
+
+	filerPort, parseErr := strconv.ParseUint(hostnameAndPort[1], 10, 64)
+	if parseErr != nil {
+		return "", fmt.Errorf("The filer filer port parse error: %v", parseErr)
+	}
+
+	filerGrpcPort := int(filerPort) + 10000
+	if optionalGrpcPort != 0 {
+		filerGrpcPort = optionalGrpcPort
+	}
+
+	return fmt.Sprintf("%s:%d", hostnameAndPort[0], filerGrpcPort), nil
+}
diff --git a/weed/command/s3.go b/weed/command/s3.go
new file mode 100644
index 000000000..03fa80ed8
--- /dev/null
+++ b/weed/command/s3.go
@@ -0,0 +1,76 @@
+package command
+
+import (
+	"net/http"
+	"time"
+
+	"github.com/chrislusf/seaweedfs/weed/glog"
+	"github.com/chrislusf/seaweedfs/weed/util"
+	"github.com/gorilla/mux"
+	"fmt"
+	"github.com/chrislusf/seaweedfs/weed/s3api"
+)
+
+var (
+	s3options S3Options
+)
+
+type S3Options struct {
+	filer            *string
+	filerGrpcPort    *int
+	filerBucketsPath *string
+	port             *int
+	domainName       *string
+}
+
+func init() {
+	cmdS3.Run = runS3 // break init cycle
+	s3options.filer = cmdS3.Flag.String("filer", "localhost:8888", "filer server address")
+	s3options.filerGrpcPort = cmdS3.Flag.Int("filer.grpcPort", 0, "filer server grpc port, default to filer http port plus 10000")
+	s3options.filerBucketsPath = cmdS3.Flag.String("filer.dir.buckets", "/s3buckets", "folder on filer to store all buckets")
+	s3options.port = cmdS3.Flag.Int("port", 8333, "s3options server http listen port")
+	s3options.domainName = cmdS3.Flag.String("domainName", "", "suffix of the host name, {bucket}.{domainName}")
+}
+
+var cmdS3 = &Command{
+	UsageLine: "s3 -port=8333 -filer=<ip:port>",
+	Short:     "start a s3 API compatible server that is backed by a filer",
+	Long: `start a s3 API compatible server that is backed by a filer.
+
+`,
+}
+
+func runS3(cmd *Command, args []string) bool {
+
+	filerGrpcAddress, err := parseFilerGrpcAddress(*s3options.filer, *s3options.filerGrpcPort)
+	if err != nil {
+		glog.Fatal(err)
+		return false
+	}
+
+	router := mux.NewRouter().SkipClean(true)
+
+	_, s3ApiServer_err := s3api.NewS3ApiServer(router, &s3api.S3ApiServerOption{
+		Filer:            *s3options.filer,
+		FilerGrpcAddress: filerGrpcAddress,
+		DomainName:       *s3options.domainName,
+		BucketsPath:      *s3options.filerBucketsPath,
+	})
+	if s3ApiServer_err != nil {
+		glog.Fatalf("S3 API Server startup error: %v", s3ApiServer_err)
+	}
+
+	glog.V(0).Infof("Start Seaweed S3 API Server %s at port %d", util.VERSION, *s3options.port)
+	s3ApiListener, e := util.NewListener(fmt.Sprintf(":%d", *s3options.port), time.Duration(10)*time.Second)
+	if e != nil {
+		glog.Fatalf("S3 API Server listener error: %v", e)
+	}
+
+	httpS := &http.Server{Handler: router}
+	if err := httpS.Serve(s3ApiListener); err != nil {
+		glog.Fatalf("S3 API Server Fail to serve: %v", e)
+	}
+
+	return true
+
+}