hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

log_manager.cc

Browse Source 
renamed file_exists to file_exists_and_is_writable, added missing file open flags.

gateway.c	
	Removed command-line parameter '-m' because setting LD_LIBRARY_PATH after the program has started has no effect.
	Corrected some comments.
This commit is contained in:
vraatikka
2013-11-26 16:52:48 +02:00
parent 973a9a34d7
commit 4057ae0b0f
2 changed files with 24 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
log_manager/log_manager.cc
View File

@ -258,7 +258,7 @@ static void blockbuf_register(blockbuf_t* bb);
static void blockbuf_unregister(blockbuf_t* bb);
static bool logfile_set_enabled(logfile_id_t id, bool val);
static char* add_slash(char* str);
static bool file_exists(char* filename);
static bool file_exists_and_is_writable(char* filename);
static bool file_is_symlink(char* filename);
@ -1800,9 +1800,11 @@ static char* add_slash(
*
*
* @details Note, that an space character is written to the end of file.
* TODO: recall what was the reason for not succeeding with simply
* calling access, and fstat. vraa 26.11.13
*
*/
static bool file_exists(
static bool file_exists_and_is_writable(
char* filename,
bool* writable)
{
@ -1815,7 +1817,7 @@ static bool file_exists(
}
else
{
fd = open(filename, O_CREAT|O_EXCL);
fd = open(filename, O_CREAT|O_EXCL, S_IRWXU);
/** file exist */
if (fd == -1)
@ -1979,7 +1981,8 @@ static bool logfile_init(
* If file exists but is different type, create fails and
* new, increased sequence number is added to file name.
*/
if (file_exists(logfile->lf_full_file_name, &writable))
if (file_exists_and_is_writable(logfile->lf_full_file_name,
&writable))
{
if (!writable ||
file_is_symlink(logfile->lf_full_file_name))
@ -1993,7 +1996,9 @@ static bool logfile_init(
{
writable = false;
if (file_exists(logfile->lf_full_link_name, &writable))
if (file_exists_and_is_writable(
logfile->lf_full_link_name,
&writable))
{
if (!writable ||
!file_is_symlink(logfile->lf_full_link_name))