berta 1.5.1 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 09e6600e17620f40aa1c19a1f1522fb9fea2bc90
-  data.tar.gz: 7d8f55eb72b8ef4bb0880d1f6e2674d5ff5ab238
+  metadata.gz: 38b7c4c208604f8f2f38e396c03dd8d0950626a9
+  data.tar.gz: 844a95982da959c7be4ba173095a7910c96e21cf
 SHA512:
-  metadata.gz: 9efb8c04d2f4cba86e470c574729cfa842b9458b536d3e9ae347a8b4909aff75b1df3909a7f6a7f513d1fdcfd7c030a58a9a80d4211b15be4ea9ecae68033669
-  data.tar.gz: b9a6e029de8abcc36a12c79eba6ada28b103cee8fff57ceda78a4bf4724e1b9a8cf70207478a39b3c8003acf207b3dad150d1b5c39fecd32d44c25dd20febd76
+  metadata.gz: 7fca088e770e144d0ad3027a54a36f4bf7b9e04a80aecc2533a7244a84ae03b88a4cfadc86fb635793a4463b5b5ef3437d6c6dee1b1d0fe53ea3b8a674a928fc
+  data.tar.gz: 63ea0386912c8a2ee7a6ba3d9d4fa5ea60521510f1614ab03a671c53547145f2bbb9d07f5b9c5268aea3e4a7e8f8a29f91474771df699205de53570f88ecc6de

data/lib/berta/user_handler.rb

@@ -22,7 +22,10 @@ module Berta
     # @param email_template [Tilt::ERBTemplate] Email template
     def notify(user_vms, email_template)
       to_notify = user_vms.keep_if(&:should_notify?)
-      return if to_notify.empty?
+      if to_notify.empty?
+        logger.debug "No notifications for user #{handle['NAME']}"
+        return
+      end
       send_notification(to_notify, email_template)
       user_vms.each(&:update_notified)
     rescue ArgumentError, Berta::Errors::Entities::NoUserEmailError => e
@@ -35,7 +38,8 @@ module Berta
       raise Berta::Errors::Entities::NoUserEmailError, "User: #{user_name} with id: #{handle['ID']} has no email set" \
         unless user_email
       email_text = email_template.render(Hash, user_email: user_email, user_name: user_name, vms: vms_data(user_vms))
-      logger.debug "Sending mail to user: #{user_name} with email: #{user_email}:\n#{email_text}"
+      logger.info "Sending mail to user: #{user_name} on email: #{user_email}"
+      logger.debug email_text
       Mail.new(email_text).deliver unless Berta::Settings['dry-run']
     end
 

data/lib/berta/version.rb

@@ -1,3 +1,3 @@
 module Berta
-  VERSION = '1.5.1'.freeze
+  VERSION = '1.5.2'.freeze
 end

data/lib/berta/virtual_machine_handler.rb

@@ -20,7 +20,11 @@ module Berta
     def update
       exps = expirations.keep_if(&:in_expiration_interval?)
       exps << next_expiration unless default_expiration
-      update_expirations(exps) unless exps == expirations
+      if exps == expirations
+        logger.debug "No changes in expirations for vm #{handle['ID']}"
+      else
+        update_expirations(exps)
+      end
     rescue Berta::Errors::BackendError => e
       logger.error "#{e.message} on vm with id #{vm.handle['ID']}"
     end
@@ -40,12 +44,8 @@ module Berta
       exp = default_expiration
       return unless exp
       notify_time = exp.time
-      logger.debug "Setting notified flag of VM with id #{handle['ID']} to #{notify_time}"
-      return if Berta::Settings['dry-run']
-      Berta::Utils::OpenNebula::Helper.handle_error do
-        handle.update("#{NOTIFIED_FLAG} = #{notify_time.to_i}", true)
-        handle.info
-      end
+      logger.info "Setting notified flag of VM with id #{handle['ID']} to #{notify_time}"
+      send_update("#{NOTIFIED_FLAG} = #{notify_time.to_i}")
     end
 
     # Determines if VM meets criteria to be notified.
@@ -105,11 +105,15 @@ module Berta
     # @note This method modifies OpenNebula database
     # @param exps [Array<Berta::Entities::Expiration>] Expirations to use
     def update_expirations(exps)
-      template = ''
-      exps.each { |exp| template += exp.template }
+      template = exps.inject('') { |temp, exp| temp + exp.template }
       return if template == ''
-      logger.debug \
-        "Setting expirations on vm with id=#{handle['ID']} usr=#{handle['UNAME']} grp=#{handle['GNAME']} : #{template.delete("\n ")}"
+      logger.info "Setting expirations on vm with id=#{handle['ID']} usr=#{handle['UNAME']} grp=#{handle['GNAME']}"
+      logger.debug template.delete("\n ")
+      send_update(template)
+    end
+
+    # Sends data to opennebula service
+    def send_update(template)
       return if Berta::Settings['dry-run']
       Berta::Utils::OpenNebula::Helper.handle_error do
         handle.update(template, true)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: berta
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.2
 platform: ruby
 authors:
 - Dusan Baran