Merge branch 'release/0.4.5'

leo-project · Jan 6, 2014 · 6f47417 · 6f47417
2 parents 455e074 + 8429cbf
commit 6f47417
Show file tree

Hide file tree

Showing 277 changed files with 93,138 additions and 2,405 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,7 @@
 *.gem
 *.rbc
 *.swp
+*.log
 .bundle
 .config
 coverage

diff --git a/Gemfile b/Gemfile
@@ -12,4 +12,4 @@ gem "sinatra", "~> 1.4.3"
 gem "sinatra-contrib"
 gem "haml"
 gem "thin"
-gem "leo_manager_client", "~> 0.4.8"
+gem "leo_manager_client", "~> 0.4.9"
diff --git a/README.md b/README.md
@@ -1,21 +1,24 @@
-LeoCenter
-==========
+# LeoCenter
 
-**Copyright (c) 2013 Rakuten, Inc.**
+**Copyright (c) 2013-2014 Rakuten, Inc.**
 
-**LeoCenter** is more powerful and user-friendly LeoFS's Web GUI Tool. You can easily operate LeoFS.
+**LeoCenter** is more powerful and user-friendly LeoFS's Web GUI Tool, the documentation of which is [here](http://www.leofs.org/docs/leo_center.html).
 
 
-Install
-========
+## Getting Started
+
+### Requirements
+* LeoFS v0.16.8 or higher
+* Ruby 1.9.3 or higher
+
+### Install
 
 ```
 $ git clone
 $ bundle install
 ```
 
-Config
-=======
+### Configure
 
 config.yml
 
@@ -28,22 +31,13 @@ config.yml
   :secret_access_key: "YOUR_SECRET_ACCESS_KEY"
 ```
 
-Run on Thin Web Server
-======================
-
-```
-$ ruby config_webrick.ru ${PORT}
-```
-
-Run on Unicorn
-==============
+### Run on Thin Web Server
 
 ```
-$ unicorn -c unicorn.conf config_unicorn.ru
+$ thin start -a ${HOST} -p ${PORT}
 ```
 
-Icons
-=====
+## Using Icons
 
 * [Database](http://barrymieny.deviantart.com/art/Database-104013446): Barry Mieny (CC BY-NC-SA 3.0)
 * [Tango Icon Library](http://tango.freedesktop.org/Tango_Icon_Library): Tango project (Public Domain)

diff --git a/app.rb b/app.rb
@@ -2,7 +2,7 @@
 #
 #  Leo Center
 #
-#  Copyright (c) 2012-2013 Rakuten, Inc.
+#  Copyright (c) 2012-2014 Rakuten, Inc.
 #
 #  This file is provided to you under the Apache License,
 #  Version 2.0 (the "License"); you may not use this file
@@ -20,7 +20,7 @@
 #
 # ======================================================================
 gem "sinatra", "~> 1.4.3"
-gem "leo_manager_client", "~> 0.4.8"
+gem "leo_manager_client", "~> 0.4.9"
 
 require "json"
 require "haml"
@@ -36,25 +36,23 @@ class LoggerEx < Logger
 end
 
 class LeoCenter < Sinatra::Base
-  Version = "0.4.4"
+  Version = "0.4.5"
   set :environment, :production
   Config = CenterHelpers.load_config
   SessionKey = "leofs_console_session"
 
   class Error < StandardError; end
 
-  use Rack::CommonLogger, LoggerEx.new('leo_center.log')
-
   session_config = Config[:session]
   if session_config.has_key?(:local)
     local_config = session_config[:local]
     unless local_config.has_key?(:secret)
       warn "session secret is not configured. please set it in config.yml. now LeoCenter uses random secret."
     end
     use Rack::Session::Cookie,
-      key: SessionKey,
-      secret: local_config[:secret] || Random.new.bytes(40),
-      expire_after: local_config[:expire_after] || 300 # 5 minutes in seconds
+    key: SessionKey,
+    secret: local_config[:secret] || Random.new.bytes(40),
+    expire_after: local_config[:expire_after] || 300 # 5 minutes in seconds
   else
     raise Error, "invalid session config: #{session_config}"
   end
@@ -93,6 +91,11 @@ module Role
   configure :production, :development do
     @@manager = LeoManager::Client.new(*Config[:managers])
 
+    enable :logging
+    access_log = File.new("#{settings.root}/log/#{settings.environment}_access.log", 'a+')
+    access_log.sync = true
+    use Rack::CommonLogger, access_log
+
     before do
       debug "params: #{params}"
       unless session[:user_id]

diff --git a/config.ru b/config.ru
@@ -0,0 +1,23 @@
+# ======================================================================
+#
+#  Leo Center
+#
+#  Copyright (c) 2012-2014 Rakuten, Inc.
+#
+#  This file is provided to you under the Apache License,
+#  Version 2.0 (the "License"); you may not use this file
+#  except in compliance with the License.  You may obtain
+#  a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#
+# ======================================================================
+require "./app"
+run LeoCenter
diff --git a/config.yml b/config.yml
@@ -13,4 +13,4 @@
   - Processes memory usage (1-min Averages)
   - System memory usage (1-min Averages)
 :plugins:
-#  - "disable_sign_up.rb"
+#  - "disable_sign_up.rb"
diff --git a/config_thin.ru b/config_thin.ru
@@ -2,7 +2,7 @@
 #
 #  Leo Center
 #
-#  Copyright (c) 2012 Rakuten, Inc.
+#  Copyright (c) 2012-2014 Rakuten, Inc.
 #
 #  This file is provided to you under the Apache License,
 #  Version 2.0 (the "License"); you may not use this file
@@ -21,4 +21,5 @@
 # ======================================================================
 require "./app"
 #LeoCenter.run!(:host => ARGV[0], :port => (ARGV[1] || 8888))
-LeoCenter.run!(:port => (ARGV[0] || 8888))
+#LeoCenter.run!(:port => (ARGV[0] || 8888))
+run LeoCenter
diff --git a/lib/bucket_status.rb b/lib/bucket_status.rb
@@ -2,7 +2,7 @@
 #
 # LeoFS
 #
-# Copyright (c) 2012-2013 Rakuten, Inc.
+# Copyright (c) 2012-2014 Rakuten, Inc.
 #
 # This file is provided to you under the Apache License,
 # Version 2.0 (the "License"); you may not use this file

diff --git a/lib/buckets.rb b/lib/buckets.rb
@@ -2,7 +2,7 @@
 #
 # LeoFS
 #
-# Copyright (c) 2012-2013 Rakuten, Inc.
+# Copyright (c) 2012-2014 Rakuten, Inc.
 #
 # This file is provided to you under the Apache License,
 # Version 2.0 (the "License"); you may not use this file

diff --git a/lib/endpoints.rb b/lib/endpoints.rb
@@ -2,7 +2,7 @@
 #
 # LeoFS
 #
-# Copyright (c) 2012-2013 Rakuten, Inc.
+# Copyright (c) 2012-2014 Rakuten, Inc.
 #
 # This file is provided to you under the Apache License,
 # Version 2.0 (the "License"); you may not use this file

diff --git a/lib/growthforecast.rb b/lib/growthforecast.rb
@@ -2,7 +2,7 @@
 #
 # LeoFS
 #
-# Copyright (c) 2012-2013 Rakuten, Inc.
+# Copyright (c) 2012-2014 Rakuten, Inc.
 #
 # This file is provided to you under the Apache License,
 # Version 2.0 (the "License"); you may not use this file

diff --git a/lib/helpers.rb b/lib/helpers.rb
@@ -2,7 +2,7 @@
 #
 # LeoFS
 #
-# Copyright (c) 2012-2013 Rakuten, Inc.
+# Copyright (c) 2012-2014 Rakuten, Inc.
 #
 # This file is provided to you under the Apache License,
 # Version 2.0 (the "License"); you may not use this file

diff --git a/lib/nodes.rb b/lib/nodes.rb
@@ -2,7 +2,7 @@
 #
 # LeoFS
 #
-# Copyright (c) 2012-2013 Rakuten, Inc.
+# Copyright (c) 2012-2014 Rakuten, Inc.
 #
 # This file is provided to you under the Apache License,
 # Version 2.0 (the "License"); you may not use this file
@@ -145,7 +145,7 @@ module GatewayLargeObjConfig
           max_chunked_objs: "Max # of chunked objects",
           max_len_for_obj: "Max size of an object",
           chunked_obj_len: "Size of a chunked object",
-          threshold_obj_len: "Threshold of size of an object"
+          threshold_of_chunk_len: "Threshold of size of an object"
         }
       end
     end

diff --git a/lib/plugins/disable_sign_up.rb b/lib/plugins/disable_sign_up.rb
@@ -2,7 +2,7 @@
 #
 # LeoFS
 #
-# Copyright (c) 2012-2013 Rakuten, Inc.
+# Copyright (c) 2012-2014 Rakuten, Inc.
 #
 # This file is provided to you under the Apache License,
 # Version 2.0 (the "License"); you may not use this file

diff --git a/lib/snmp.rb b/lib/snmp.rb
@@ -2,7 +2,7 @@
 #
 # LeoFS
 #
-# Copyright (c) 2012-2013 Rakuten, Inc.
+# Copyright (c) 2012-2014 Rakuten, Inc.
 #
 # This file is provided to you under the Apache License,
 # Version 2.0 (the "License"); you may not use this file

diff --git a/lib/system_conf.rb b/lib/system_conf.rb
@@ -2,7 +2,7 @@
 #
 # LeoFS
 #
-# Copyright (c) 2012-2013 Rakuten, Inc.
+# Copyright (c) 2012-2014 Rakuten, Inc.
 #
 # This file is provided to you under the Apache License,
 # Version 2.0 (the "License"); you may not use this file

diff --git a/lib/user_group.rb b/lib/user_group.rb
@@ -2,7 +2,7 @@
 #
 # LeoFS
 #
-# Copyright (c) 2012-2013 Rakuten, Inc.
+# Copyright (c) 2012-2014 Rakuten, Inc.
 #
 # This file is provided to you under the Apache License,
 # Version 2.0 (the "License"); you may not use this file

diff --git a/lib/users.rb b/lib/users.rb
@@ -2,7 +2,7 @@
 #
 # LeoFS
 #
-# Copyright (c) 2012-2013 Rakuten, Inc.
+# Copyright (c) 2012-2014 Rakuten, Inc.
 #
 # This file is provided to you under the Apache License,
 # Version 2.0 (the "License"); you may not use this file

diff --git a/lib/whereis.rb b/lib/whereis.rb
@@ -2,7 +2,7 @@
 #
 # LeoFS
 #
-# Copyright (c) 2012-2013 Rakuten, Inc.
+# Copyright (c) 2012-2014 Rakuten, Inc.
 #
 # This file is provided to you under the Apache License,
 # Version 2.0 (the "License"); you may not use this file

diff --git a/log/.gitkeep b/log/.gitkeep
diff --git a/public/js/admin.js b/public/js/admin.js
@@ -2,7 +2,7 @@
 //
 // LeoFS
 //
-// Copyright (c) 2012-2013 Rakuten, Inc.
+// Copyright (c) 2012-2014 Rakuten, Inc.
 //
 // This file is provided to you under the Apache License,
 // Version 2.0 (the "License"); you may not use this file

diff --git a/public/js/index.js → public/js/base_pane.js b/public/js/index.js → public/js/base_pane.js
@@ -2,7 +2,7 @@
 //
 // LeoFS
 //
-// Copyright (c) 2012-2013 Rakuten, Inc.
+// Copyright (c) 2012-2014 Rakuten, Inc.
 //
 // This file is provided to you under the Apache License,
 // Version 2.0 (the "License"); you may not use this file
@@ -20,13 +20,6 @@
 //
 //======================================================================
 (function() {
-  /* config for logs
-     Highcharts.setOptions({
-     credits: { enabled: false },
-     global: { useUTC: false }
-     });
-  */
-
   Ext.onReady(function() {
     var bucket_status = Ext.create("LeoCenter.BucketStatus");
     var user_group = Ext.create("LeoCenter.UserGroup");

diff --git a/public/js/bucket_status.js b/public/js/bucket_status.js
@@ -2,7 +2,7 @@
 //
 // LeoFS
 //
-// Copyright (c) 2012-2013 Rakuten, Inc.
+// Copyright (c) 2012-2014 Rakuten, Inc.
 //
 // This file is provided to you under the Apache License,
 // Version 2.0 (the "License"); you may not use this file

diff --git a/public/js/buckets.js b/public/js/buckets.js
@@ -2,7 +2,7 @@
 //
 // LeoFS
 //
-// Copyright (c) 2012-2013 Rakuten, Inc.
+// Copyright (c) 2012-2014 Rakuten, Inc.
 //
 // This file is provided to you under the Apache License,
 // Version 2.0 (the "License"); you may not use this file

diff --git a/public/js/endpoints.js b/public/js/endpoints.js
@@ -2,7 +2,7 @@
 //
 // LeoFS
 //
-// Copyright (c) 2012-2013 Rakuten, Inc.
+// Copyright (c) 2012-2014 Rakuten, Inc.
 //
 // This file is provided to you under the Apache License,
 // Version 2.0 (the "License"); you may not use this file

diff --git a/public/js/highcharts/adapters/mootools-adapter.js b/public/js/highcharts/adapters/mootools-adapter.js
-Original file line number
+Diff line change
@@ -1,6 +1,7 @@
     *.gem
     *.rbc
     *.swp
+    *.log
     .bundle
     .config
     coverage
@@ Expand Down @@