Skip to content

Commit

Permalink
Fix: log must use the mask defined into setup
Browse files Browse the repository at this point in the history
Conflicts:
	htdocs/core/modules/syslog/mod_syslog_file.php
  • Loading branch information
eldy committed Apr 23, 2013
1 parent ff3b293 commit 3f1f065
Showing 1 changed file with 9 additions and 1 deletion.
10 changes: 9 additions & 1 deletion htdocs/core/modules/syslog/mod_syslog_file.php
Expand Up @@ -96,7 +96,12 @@ public function checkConfiguration()
/**
* Return the parsed logfile path
*
<<<<<<< OURS
* @return string
=======
* @param string $suffixinfilename When output is a file, append this suffix into default log filename.
* @return string
>>>>>>> THEIRS
*/
private function getFilename()
{
Expand All @@ -111,6 +116,8 @@ private function getFilename()
*/
public function export($content)
{
global $conf;

$logfile = $this->getFilename();

if (defined("SYSLOG_FILE_NO_ERROR")) $filefd = @fopen($logfile, 'a+');
Expand Down Expand Up @@ -142,6 +149,7 @@ public function export($content)

fwrite($filefd, $message."\n");
fclose($filefd);
@chmod($logfile, octdec($conf->global->MAIN_UMASK));
}
}
}
}

1 comment on commit 3f1f065

@rdoursenaud
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like you have traces of an unfinished merge.

Please sign in to comment.