Permalink
Browse files

Merge branch 'load-tables-from-module' of github.com:hbase-sculptor/s…

…culptor into load-tables-from-module
  • Loading branch information...
2 parents 3787435 + aa6edef commit 305fd4505b87b6a5c9797f8aafbec6fd7a23b3d6 @uprush uprush committed Mar 18, 2012
Showing with 11 additions and 10 deletions.
  1. +1 −1 framework/ruby/classes/Initialize.rb
  2. +4 −8 framework/ruby/sculptor.rb
  3. +6 −1 sculptor
View
2 framework/ruby/classes/Initialize.rb
@@ -67,7 +67,7 @@
log_level = org.apache.log4j.Level::ERROR
org.apache.log4j.Logger.getLogger("org.apache.zookeeper").setLevel(log_level)
org.apache.log4j.Logger.getLogger("org.apache.hadoop").setLevel(log_level)
-org.apache.log4j.Logger.getLogger("sculptor").setLevel(log_level)
+# org.apache.log4j.Logger.getLogger("sculptor").setLevel(log_level)
$tableNameList = [];
$fieldNameList = [];
View
12 framework/ruby/sculptor.rb
@@ -21,6 +21,7 @@
#Sculptorのメインスクリプト
#
require 'etc'
+require 'pp'
$userName = Etc.getlogin;
@@ -93,15 +94,10 @@
end
end
rescue SyntaxError => e
- eputs "不正な値が入力されました";
- rescue NativeException => e
- eputs "apiエラーです";
- eputs e.cause
- rescue HBaseClientException => e
- eputs e.getMessage();
+ eputs "Command syntax error.";
rescue => e
- # TODO エラーハンドリング
- p e;
+ pp e;
+ pp e.backtrace
end
#-eならばループしない
if(ARGV[0]) then
View
7 sculptor
@@ -23,7 +23,12 @@ bin=`dirname "$0"`
bin=`cd "$bin"; pwd`
HBASE_HOME=/usr/local/hbase/current
-HBASE_CLASSPATH=$HBASE_CLASSPATH:$bin/sculptor-0.0.1.jar
+
+# add sculptor.jar to HBase classpath
+for jar in $bin/sculptor-*.jar
+do
+ HBASE_CLASSPATH=$HBASE_CLASSPATH:$jar
+done
# add user defined libraries
if [ -z "$SCULPTOR_AUXLIB_PATH" ]; then

0 comments on commit 305fd45

Please sign in to comment.