Merge branch 'master' of git://github.com/mmarseglia/puppet-memcached…

… into mmarseglia-master

Conflicts:
	manifests/init.pp
	templates/memcached_sysconfig.erb

manifests/init.pp

@@ -2,10 +2,16 @@
 #
 # Manage memcached
 #
+# == Parameters
+# [* syslog *]
+# Boolean.
+# If true will pipe output to /bin/logger, sends to syslog.
+#
 class memcached (
   $package_ensure  = 'present',
   $service_manage  = true,
   $logfile         = $::memcached::params::logfile,
+  $syslog          = false,
   $pidfile         = '/var/run/memcached.pid',
   $manage_firewall = false,
   $max_memory      = false,
@@ -38,6 +44,14 @@
   validate_bool($service_restart)
   validate_bool($service_manage)
 
+  validate_bool($syslog)
+
+  # Logging to syslog and file are mutually exclusive
+  # Fail if both options are defined
+  if $syslog and str2bool("$logfile") {
+    fail 'Define either syslog or logfile as logging destinations but not both.'
+  }
+
   if $package_ensure == 'absent' {
     $service_ensure = 'stopped'
     $service_enable = false

templates/memcached_sysconfig.erb

@@ -15,8 +15,18 @@ end
 if @item_size
   result << '-I ' + @item_size.to_s
 end
+<<<<<<< HEAD
 result << '-t ' + @processorcount.to_s
 if @logfile
+=======
+result << '-t ' + @processorcount
+
+# log to syslog via logger
+if @syslog && @logfile.empty?
+	result << '2>&1 |/bin/logger &'
+# log to log file
+elsif [email protected]? && !@syslog
+>>>>>>> af4672c9681860415f5bad212fdbdd90217d5844
   result << '>> ' + @logfile + ' 2>&1'
 end
 -%>