diff --git a/src/acct/acctd.rb b/src/acct/acctd.rb index ad43193135..bb895f1984 100755 --- a/src/acct/acctd.rb +++ b/src/acct/acctd.rb @@ -32,7 +32,6 @@ $: << RUBY_LIB_LOCATION+"/acct" require 'yaml' require 'OpenNebula' -require 'sequel' require 'watch_helper' CONF = YAML.load_file(ACCTD_CONF) @@ -115,7 +114,6 @@ if CONF[:ACCOUNTING_STEPS] > 0 watcher.add(accounting, CONF[:ACCOUNTING_STEPS], vm_pool) end - step = 0 loop do start_time = Time.now diff --git a/src/acct/watch_client.rb b/src/acct/watch_client.rb index bcceb40d66..aea2d0c34a 100644 --- a/src/acct/watch_client.rb +++ b/src/acct/watch_client.rb @@ -1,5 +1,5 @@ module OneWatchClient - require 'watch_helper' + require 'acct/watch_helper' class WatchClient def vm_monitoring(id, opts=[]) diff --git a/src/acct/watch_helper.rb b/src/acct/watch_helper.rb index 8557c05bd7..5021dec06a 100644 --- a/src/acct/watch_helper.rb +++ b/src/acct/watch_helper.rb @@ -1,4 +1,5 @@ module WatchHelper + require 'sequel' require 'yaml' ONE_LOCATION=ENV["ONE_LOCATION"] diff --git a/src/sunstone/models/SunstoneServer.rb b/src/sunstone/models/SunstoneServer.rb index 70c915798a..99b3d5c147 100644 --- a/src/sunstone/models/SunstoneServer.rb +++ b/src/sunstone/models/SunstoneServer.rb @@ -17,7 +17,7 @@ require 'OpenNebulaJSON' include OpenNebulaJSON -require 'acct/WatchClient' +require 'acct/watch_client' class SunstoneServer def initialize(username, password)