diff --git a/src/acct/etc/acctd.conf b/src/acct/etc/acctd.conf index 7b4e099817..bfb1879c88 100644 --- a/src/acct/etc/acctd.conf +++ b/src/acct/etc/acctd.conf @@ -15,7 +15,7 @@ #--------------------------------------------------------------------------- # # Database URI -:DB: sqlite:///tmp/test_one_acct.db +#:DB: sqlite:///var/one/oneacct.db # Duration of each daemon loop in seconds :STEP: 300 # 5 minutes diff --git a/src/acct/watch_helper.rb b/src/acct/watch_helper.rb index 4cc5ab9c98..c9112b2496 100644 --- a/src/acct/watch_helper.rb +++ b/src/acct/watch_helper.rb @@ -6,13 +6,20 @@ module WatchHelper if !ONE_LOCATION ACCTD_CONF="/etc/one/acctd.conf" + ACCT_DB="/var/one/oneacct.db" else ACCTD_CONF=ONE_LOCATION+"/etc/acctd.conf" + ACCT_DB=ONE_LOCATION+"/var/oneacct.db" end CONF = YAML.load_file(ACCTD_CONF) - DB = Sequel.connect(CONF[:DB]) + if CONF[:DB] + DB = Sequel.connect(CONF[:DB]) + else + DB = Sequel.connect("sqlite//#{ACCT_DB}") + end + VM_DELTA = { :net_rx => { :type => Integer,