change postgresql first start detection

sample · sample · commit 42cb437705da · 2014-06-16T15:15:41.000+04:00
diff --git a/libraries/helpers.rb b/libraries/helpers.rb
@@ -30,20 +30,28 @@ class Chef
   module Postgresql
     # Helpers module
     module Helpers
+      def pg_installed?(pkg_name)
+        dpkg_status = Mixlib::ShellOut.new("dpkg-query -W -f='${Status}\n' #{pkg_name} 2>/dev/null | grep -c -q 'ok installed'")
+        dpkg_status.run_command
+        if dpkg_status.exitstatus == 0
+          false
+        else
+          true
+        end
+      end
+
       def exec_in_pg_cluster(cluster_version, cluster_name, sql)
         return false unless pg_running?(cluster_version, cluster_name)
         postmaster_content = ::File.open("/var/lib/postgresql/#{cluster_version}/#{cluster_name}/postmaster.pid").readlines
         pg_port = postmaster_content[3].to_i
         psql_status = Mixlib::ShellOut.new("echo -n \"#{sql};\" | su -c 'psql -t -p #{pg_port}' postgres")
         psql_status.run_command
-        Chef::Log.info(psql_status.stdout)
-        Chef::Log.info(psql_status.stderr)
         [psql_status.stdout, psql_status.stderr]
       end
 
-      def need_to_restart?(cluster_version, cluster_name, advanced_options, node)
+      def need_to_restart?(advanced_options, first_time)
         if advanced_options[:restart] == :first
-          return (!defined? node['postgresql'][cluster_version][cluster_name]['success_at_least_once'])
+          return first_time
         elsif advanced_options[:restart] == :always
           return true
         end
diff --git a/providers/default.rb b/providers/default.rb
@@ -57,6 +57,8 @@
     ENV['LANG'] = new_resource.cluster_create_options['locale']
   end
 
+  first_time = pg_installed?("postgresql-#{configuration['version']}")
+
   # Install packages
   %W(postgresql-#{configuration['version']} postgresql-server-dev-all).each do |pkg|
     package pkg
@@ -82,20 +84,12 @@
     status_command "su -c '/usr/lib/postgresql/#{cluster_version}/bin/pg_ctl \
  -D /var/lib/postgresql/#{cluster_version}/#{cluster_name} status' postgres"
     supports status: true, restart: true, reload: true
-    notifies :create, 'ruby_block[set_success_mark]', :delayed
-  end
-
-  ruby_block 'set_success_mark' do
-    action :nothing
-    block do
-      node.normal['postgresql'][cluster_version][cluster_name]['success_at_least_once'] = true
-    end
   end
 
   ruby_block 'restart_service' do
     action :nothing
     block do
-      if need_to_restart?(cluster_version, cluster_name, advanced_options, node)
+      if need_to_restart?(advanced_options, first_time)
         run_context.notifies_delayed(Chef::Resource::Notification.new(postgresql_service, :restart, self))
       else
         run_context.notifies_delayed(Chef::Resource::Notification.new(postgresql_service, :reload, self))
