From b836ceea905db1ce6ec26544535ef717514dd257 Mon Sep 17 00:00:00 2001 From: Scott Schneider Date: Fri, 22 Aug 2014 11:04:38 -0700 Subject: [PATCH] Custom-set VM lifetimes override system-wide --- lib/vmpooler/pool_manager.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/vmpooler/pool_manager.rb b/lib/vmpooler/pool_manager.rb index 944c79e..cc50e1d 100644 --- a/lib/vmpooler/pool_manager.rb +++ b/lib/vmpooler/pool_manager.rb @@ -380,9 +380,11 @@ module Vmpooler $redis.smembers('vmpooler__running__'+pool['name']).each do |vm| if ($redis.hget('vmpooler__active__'+pool['name'], vm)) running = (Time.now - Time.parse($redis.hget('vmpooler__active__'+pool['name'], vm)))/60/60 + lifetime = $redis.hget('vmpooler__vm__'+vm, 'lifetime') || $config[:config]['vm_lifetime'] + if ( - ($config[:config]['vm_lifetime'] > 0) and - (running > $config[:config]['vm_lifetime']) + (lifetime.to_i > 0) and + (running.to_i > lifetime.to_i) ) $redis.smove('vmpooler__running__'+pool['name'], 'vmpooler__completed__'+pool['name'], vm)