Fix for Fanvil OutputDevice to allow an empty value
- Reported that stdout could cause audio issue on some models so this provides an option to leave it empty. - Default the value to empty - Continued support for fanvil_syslog_enable
This commit is contained in:
@@ -1463,7 +1463,13 @@
|
||||
<log>
|
||||
<Level>ERROR</Level>
|
||||
<Style>level,tag</Style>
|
||||
<OutputDevice>{if $fanvil_syslog_enable == '1'},syslog{else}stdout{/if}</OutputDevice>
|
||||
{if $fanvil_syslog_enable == '1'}<OutputDevice>syslog</OutputDevice>
|
||||
{elseif $fanvil_output_device == ''}<OutputDevice></OutputDevice>
|
||||
{elseif $fanvil_output_device == 'syslog'}<OutputDevice>syslog</OutputDevice>
|
||||
{elseif $fanvil_output_device == 'stdout'}<OutputDevice>stdout</OutputDevice>
|
||||
{elseif $fanvil_output_device == 'syslog,stdout'}<OutputDevice>syslog,stdout</OutputDevice>
|
||||
{elseif $fanvil_output_device == 'stdout,syslog'}<OutputDevice>syslog,stdout</OutputDevice>
|
||||
{/if}
|
||||
<FileName>platform.log</FileName>
|
||||
<FileSize>512KB</FileSize>
|
||||
<SyslogTag>platform</SyslogTag>
|
||||
|
||||
@@ -1751,7 +1751,13 @@
|
||||
<log>
|
||||
<Level>INFO</Level>
|
||||
<Style>level,tag</Style>
|
||||
<OutputDevice>{if $fanvil_syslog_enable == '1'},syslog{else}stdout{/if}</OutputDevice>
|
||||
{if $fanvil_syslog_enable == '1'}<OutputDevice>syslog</OutputDevice>
|
||||
{elseif $fanvil_output_device == ''}<OutputDevice></OutputDevice>
|
||||
{elseif $fanvil_output_device == 'syslog'}<OutputDevice>syslog</OutputDevice>
|
||||
{elseif $fanvil_output_device == 'stdout'}<OutputDevice>stdout</OutputDevice>
|
||||
{elseif $fanvil_output_device == 'syslog,stdout'}<OutputDevice>syslog,stdout</OutputDevice>
|
||||
{elseif $fanvil_output_device == 'stdout,syslog'}<OutputDevice>syslog,stdout</OutputDevice>
|
||||
{/if}
|
||||
<FileName>platform.log</FileName>
|
||||
<FileSize>512KB</FileSize>
|
||||
<SyslogTag>platform</SyslogTag>
|
||||
|
||||
@@ -1235,7 +1235,13 @@
|
||||
<log>
|
||||
<Level>ERROR</Level>
|
||||
<Style>level,tag</Style>
|
||||
<OutputDevice>stdout</OutputDevice>
|
||||
{if $fanvil_syslog_enable == '1'}<OutputDevice>syslog</OutputDevice>
|
||||
{elseif $fanvil_output_device == ''}<OutputDevice></OutputDevice>
|
||||
{elseif $fanvil_output_device == 'syslog'}<OutputDevice>syslog</OutputDevice>
|
||||
{elseif $fanvil_output_device == 'stdout'}<OutputDevice>stdout</OutputDevice>
|
||||
{elseif $fanvil_output_device == 'syslog,stdout'}<OutputDevice>syslog,stdout</OutputDevice>
|
||||
{elseif $fanvil_output_device == 'stdout,syslog'}<OutputDevice>syslog,stdout</OutputDevice>
|
||||
{/if}
|
||||
<FileName>platform.log</FileName>
|
||||
<FileSize>512KB</FileSize>
|
||||
<SyslogTag>platform</SyslogTag>
|
||||
|
||||
@@ -1114,7 +1114,13 @@
|
||||
<log>
|
||||
<Level>ERROR</Level>
|
||||
<Style>level,tag</Style>
|
||||
<OutputDevice>{if $fanvil_syslog_enable == '1'},syslog{else}stdout{/if}</OutputDevice>
|
||||
{if $fanvil_syslog_enable == '1'}<OutputDevice>syslog</OutputDevice>
|
||||
{elseif $fanvil_output_device == ''}<OutputDevice></OutputDevice>
|
||||
{elseif $fanvil_output_device == 'syslog'}<OutputDevice>syslog</OutputDevice>
|
||||
{elseif $fanvil_output_device == 'stdout'}<OutputDevice>stdout</OutputDevice>
|
||||
{elseif $fanvil_output_device == 'syslog,stdout'}<OutputDevice>syslog,stdout</OutputDevice>
|
||||
{elseif $fanvil_output_device == 'stdout,syslog'}<OutputDevice>syslog,stdout</OutputDevice>
|
||||
{/if}
|
||||
<FileName>platform.log</FileName>
|
||||
<FileSize>512KB</FileSize>
|
||||
<SyslogTag>platform</SyslogTag>
|
||||
|
||||
@@ -1114,7 +1114,13 @@
|
||||
<log>
|
||||
<Level>ERROR</Level>
|
||||
<Style>level,tag</Style>
|
||||
<OutputDevice>{if $fanvil_syslog_enable == '1'},syslog{else}stdout{/if}</OutputDevice>
|
||||
{if $fanvil_syslog_enable == '1'}<OutputDevice>syslog</OutputDevice>
|
||||
{elseif $fanvil_output_device == ''}<OutputDevice></OutputDevice>
|
||||
{elseif $fanvil_output_device == 'syslog'}<OutputDevice>syslog</OutputDevice>
|
||||
{elseif $fanvil_output_device == 'stdout'}<OutputDevice>stdout</OutputDevice>
|
||||
{elseif $fanvil_output_device == 'syslog,stdout'}<OutputDevice>syslog,stdout</OutputDevice>
|
||||
{elseif $fanvil_output_device == 'stdout,syslog'}<OutputDevice>syslog,stdout</OutputDevice>
|
||||
{/if}
|
||||
<FileName>platform.log</FileName>
|
||||
<FileSize>512KB</FileSize>
|
||||
<SyslogTag>platform</SyslogTag>
|
||||
|
||||
@@ -1114,7 +1114,13 @@
|
||||
<log>
|
||||
<Level>ERROR</Level>
|
||||
<Style>level,tag</Style>
|
||||
<OutputDevice>{if $fanvil_syslog_enable == '1'},syslog{else}stdout{/if}</OutputDevice>
|
||||
{if $fanvil_syslog_enable == '1'}<OutputDevice>syslog</OutputDevice>
|
||||
{elseif $fanvil_output_device == ''}<OutputDevice></OutputDevice>
|
||||
{elseif $fanvil_output_device == 'syslog'}<OutputDevice>syslog</OutputDevice>
|
||||
{elseif $fanvil_output_device == 'stdout'}<OutputDevice>stdout</OutputDevice>
|
||||
{elseif $fanvil_output_device == 'syslog,stdout'}<OutputDevice>syslog,stdout</OutputDevice>
|
||||
{elseif $fanvil_output_device == 'stdout,syslog'}<OutputDevice>syslog,stdout</OutputDevice>
|
||||
{/if}
|
||||
<FileName>platform.log</FileName>
|
||||
<FileSize>512KB</FileSize>
|
||||
<SyslogTag>platform</SyslogTag>
|
||||
|
||||
@@ -4142,7 +4142,13 @@
|
||||
<log>
|
||||
<Level>INFO</Level>
|
||||
<Style>level,tag</Style>
|
||||
<OutputDevice>{if $fanvil_syslog_enable == '1'},syslog{else}stdout{/if}</OutputDevice>
|
||||
{if $fanvil_syslog_enable == '1'}<OutputDevice>syslog</OutputDevice>
|
||||
{elseif $fanvil_output_device == ''}<OutputDevice></OutputDevice>
|
||||
{elseif $fanvil_output_device == 'syslog'}<OutputDevice>syslog</OutputDevice>
|
||||
{elseif $fanvil_output_device == 'stdout'}<OutputDevice>stdout</OutputDevice>
|
||||
{elseif $fanvil_output_device == 'syslog,stdout'}<OutputDevice>syslog,stdout</OutputDevice>
|
||||
{elseif $fanvil_output_device == 'stdout,syslog'}<OutputDevice>syslog,stdout</OutputDevice>
|
||||
{/if}
|
||||
<FileName>platform.log</FileName>
|
||||
<FileSize>512KB</FileSize>
|
||||
<SyslogTag>platform</SyslogTag>
|
||||
|
||||
@@ -1463,7 +1463,13 @@
|
||||
<log>
|
||||
<Level>ERROR</Level>
|
||||
<Style>level,tag</Style>
|
||||
<OutputDevice>{if $fanvil_syslog_enable == '1'},syslog{else}stdout{/if}</OutputDevice>
|
||||
{if $fanvil_syslog_enable == '1'}<OutputDevice>syslog</OutputDevice>
|
||||
{elseif $fanvil_output_device == ''}<OutputDevice></OutputDevice>
|
||||
{elseif $fanvil_output_device == 'syslog'}<OutputDevice>syslog</OutputDevice>
|
||||
{elseif $fanvil_output_device == 'stdout'}<OutputDevice>stdout</OutputDevice>
|
||||
{elseif $fanvil_output_device == 'syslog,stdout'}<OutputDevice>syslog,stdout</OutputDevice>
|
||||
{elseif $fanvil_output_device == 'stdout,syslog'}<OutputDevice>syslog,stdout</OutputDevice>
|
||||
{/if}
|
||||
<FileName>platform.log</FileName>
|
||||
<FileSize>512KB</FileSize>
|
||||
<SyslogTag>platform</SyslogTag>
|
||||
|
||||
@@ -1463,7 +1463,13 @@
|
||||
<log>
|
||||
<Level>ERROR</Level>
|
||||
<Style>level,tag</Style>
|
||||
<OutputDevice>{if $fanvil_syslog_enable == '1'},syslog{else}stdout{/if}</OutputDevice>
|
||||
{if $fanvil_syslog_enable == '1'}<OutputDevice>syslog</OutputDevice>
|
||||
{elseif $fanvil_output_device == ''}<OutputDevice></OutputDevice>
|
||||
{elseif $fanvil_output_device == 'syslog'}<OutputDevice>syslog</OutputDevice>
|
||||
{elseif $fanvil_output_device == 'stdout'}<OutputDevice>stdout</OutputDevice>
|
||||
{elseif $fanvil_output_device == 'syslog,stdout'}<OutputDevice>syslog,stdout</OutputDevice>
|
||||
{elseif $fanvil_output_device == 'stdout,syslog'}<OutputDevice>syslog,stdout</OutputDevice>
|
||||
{/if}
|
||||
<FileName>platform.log</FileName>
|
||||
<FileSize>512KB</FileSize>
|
||||
<SyslogTag>platform</SyslogTag>
|
||||
|
||||
@@ -1463,7 +1463,13 @@
|
||||
<log>
|
||||
<Level>ERROR</Level>
|
||||
<Style>level,tag</Style>
|
||||
<OutputDevice>{if $fanvil_syslog_enable == '1'},syslog{else}stdout{/if}</OutputDevice>
|
||||
{if $fanvil_syslog_enable == '1'}<OutputDevice>syslog</OutputDevice>
|
||||
{elseif $fanvil_output_device == ''}<OutputDevice></OutputDevice>
|
||||
{elseif $fanvil_output_device == 'syslog'}<OutputDevice>syslog</OutputDevice>
|
||||
{elseif $fanvil_output_device == 'stdout'}<OutputDevice>stdout</OutputDevice>
|
||||
{elseif $fanvil_output_device == 'syslog,stdout'}<OutputDevice>syslog,stdout</OutputDevice>
|
||||
{elseif $fanvil_output_device == 'stdout,syslog'}<OutputDevice>syslog,stdout</OutputDevice>
|
||||
{/if}
|
||||
<FileName>platform.log</FileName>
|
||||
<FileSize>512KB</FileSize>
|
||||
<SyslogTag>platform</SyslogTag>
|
||||
|
||||
@@ -1794,7 +1794,13 @@
|
||||
<log>
|
||||
<Level>ERROR</Level>
|
||||
<Style>level,tag</Style>
|
||||
<OutputDevice>{if $fanvil_syslog_enable == '1'},syslog{else}stdout{/if}</OutputDevice>
|
||||
{if $fanvil_syslog_enable == '1'}<OutputDevice>syslog</OutputDevice>
|
||||
{elseif $fanvil_output_device == ''}<OutputDevice></OutputDevice>
|
||||
{elseif $fanvil_output_device == 'syslog'}<OutputDevice>syslog</OutputDevice>
|
||||
{elseif $fanvil_output_device == 'stdout'}<OutputDevice>stdout</OutputDevice>
|
||||
{elseif $fanvil_output_device == 'syslog,stdout'}<OutputDevice>syslog,stdout</OutputDevice>
|
||||
{elseif $fanvil_output_device == 'stdout,syslog'}<OutputDevice>syslog,stdout</OutputDevice>
|
||||
{/if}
|
||||
<FileName>platform.log</FileName>
|
||||
<FileSize>512KB</FileSize>
|
||||
<SyslogTag>platform</SyslogTag>
|
||||
|
||||
@@ -1777,7 +1777,13 @@
|
||||
<log>
|
||||
<Level>ERROR</Level>
|
||||
<Style>level,tag</Style>
|
||||
<OutputDevice></OutputDevice>
|
||||
{if $fanvil_syslog_enable == '1'}<OutputDevice>syslog</OutputDevice>
|
||||
{elseif $fanvil_output_device == ''}<OutputDevice></OutputDevice>
|
||||
{elseif $fanvil_output_device == 'syslog'}<OutputDevice>syslog</OutputDevice>
|
||||
{elseif $fanvil_output_device == 'stdout'}<OutputDevice>stdout</OutputDevice>
|
||||
{elseif $fanvil_output_device == 'syslog,stdout'}<OutputDevice>syslog,stdout</OutputDevice>
|
||||
{elseif $fanvil_output_device == 'stdout,syslog'}<OutputDevice>syslog,stdout</OutputDevice>
|
||||
{/if}
|
||||
<FileName>platform.log</FileName>
|
||||
<FileSize>512KB</FileSize>
|
||||
<SyslogTag>platform</SyslogTag>
|
||||
|
||||
@@ -2849,7 +2849,13 @@
|
||||
<log>
|
||||
<Level>INFO</Level>
|
||||
<Style>level,tag</Style>
|
||||
<OutputDevice>{if $fanvil_syslog_enable == '1'},syslog{else}stdout{/if}</OutputDevice>
|
||||
{if $fanvil_syslog_enable == '1'}<OutputDevice>syslog</OutputDevice>
|
||||
{elseif $fanvil_output_device == ''}<OutputDevice></OutputDevice>
|
||||
{elseif $fanvil_output_device == 'syslog'}<OutputDevice>syslog</OutputDevice>
|
||||
{elseif $fanvil_output_device == 'stdout'}<OutputDevice>stdout</OutputDevice>
|
||||
{elseif $fanvil_output_device == 'syslog,stdout'}<OutputDevice>syslog,stdout</OutputDevice>
|
||||
{elseif $fanvil_output_device == 'stdout,syslog'}<OutputDevice>syslog,stdout</OutputDevice>
|
||||
{/if}
|
||||
<FileName>platform.log</FileName>
|
||||
<FileSize>512KB</FileSize>
|
||||
<SyslogTag>platform</SyslogTag>
|
||||
|
||||
@@ -1685,7 +1685,13 @@
|
||||
<log>
|
||||
<Level>INFO</Level>
|
||||
<Style>level,tag</Style>
|
||||
<OutputDevice>stdout{if $fanvil_syslog_enable == '1'},syslog{else}{/if}</OutputDevice>
|
||||
{if $fanvil_syslog_enable == '1'}<OutputDevice>syslog</OutputDevice>
|
||||
{elseif $fanvil_output_device == ''}<OutputDevice></OutputDevice>
|
||||
{elseif $fanvil_output_device == 'syslog'}<OutputDevice>syslog</OutputDevice>
|
||||
{elseif $fanvil_output_device == 'stdout'}<OutputDevice>stdout</OutputDevice>
|
||||
{elseif $fanvil_output_device == 'syslog,stdout'}<OutputDevice>syslog,stdout</OutputDevice>
|
||||
{elseif $fanvil_output_device == 'stdout,syslog'}<OutputDevice>syslog,stdout</OutputDevice>
|
||||
{/if}
|
||||
<FileName>platform.log</FileName>
|
||||
<FileSize>512KB</FileSize>
|
||||
<SyslogTag>platform</SyslogTag>
|
||||
|
||||
@@ -3495,7 +3495,13 @@
|
||||
<log>
|
||||
<Level>INFO</Level>
|
||||
<Style>level,tag</Style>
|
||||
<OutputDevice>{if $fanvil_syslog_enable == '1'},syslog{else}stdout{/if}</OutputDevice>
|
||||
{if $fanvil_syslog_enable == '1'}<OutputDevice>syslog</OutputDevice>
|
||||
{elseif $fanvil_output_device == ''}<OutputDevice></OutputDevice>
|
||||
{elseif $fanvil_output_device == 'syslog'}<OutputDevice>syslog</OutputDevice>
|
||||
{elseif $fanvil_output_device == 'stdout'}<OutputDevice>stdout</OutputDevice>
|
||||
{elseif $fanvil_output_device == 'syslog,stdout'}<OutputDevice>syslog,stdout</OutputDevice>
|
||||
{elseif $fanvil_output_device == 'stdout,syslog'}<OutputDevice>syslog,stdout</OutputDevice>
|
||||
{/if}
|
||||
<FileName>platform.log</FileName>
|
||||
<FileSize>512KB</FileSize>
|
||||
<SyslogTag>platform</SyslogTag>
|
||||
|
||||
@@ -1671,7 +1671,13 @@
|
||||
<log>
|
||||
<Level>INFO</Level>
|
||||
<Style>level,tag</Style>
|
||||
<OutputDevice>stdout{if $fanvil_syslog_enable == '1'},syslog{else}{/if}</OutputDevice>
|
||||
{if $fanvil_syslog_enable == '1'}<OutputDevice>syslog</OutputDevice>
|
||||
{elseif $fanvil_output_device == ''}<OutputDevice></OutputDevice>
|
||||
{elseif $fanvil_output_device == 'syslog'}<OutputDevice>syslog</OutputDevice>
|
||||
{elseif $fanvil_output_device == 'stdout'}<OutputDevice>stdout</OutputDevice>
|
||||
{elseif $fanvil_output_device == 'syslog,stdout'}<OutputDevice>syslog,stdout</OutputDevice>
|
||||
{elseif $fanvil_output_device == 'stdout,syslog'}<OutputDevice>syslog,stdout</OutputDevice>
|
||||
{/if}
|
||||
<FileName>platform.log</FileName>
|
||||
<FileSize>512KB</FileSize>
|
||||
<SyslogTag>platform</SyslogTag>
|
||||
|
||||
@@ -4148,7 +4148,13 @@
|
||||
<log>
|
||||
<Level>INFO</Level>
|
||||
<Style>level,tag</Style>
|
||||
<OutputDevice>{if $fanvil_syslog_enable == '1'},syslog{else}stdout{/if}</OutputDevice>
|
||||
{if $fanvil_syslog_enable == '1'}<OutputDevice>syslog</OutputDevice>
|
||||
{elseif $fanvil_output_device == ''}<OutputDevice></OutputDevice>
|
||||
{elseif $fanvil_output_device == 'syslog'}<OutputDevice>syslog</OutputDevice>
|
||||
{elseif $fanvil_output_device == 'stdout'}<OutputDevice>stdout</OutputDevice>
|
||||
{elseif $fanvil_output_device == 'syslog,stdout'}<OutputDevice>syslog,stdout</OutputDevice>
|
||||
{elseif $fanvil_output_device == 'stdout,syslog'}<OutputDevice>syslog,stdout</OutputDevice>
|
||||
{/if}
|
||||
<FileName>platform.log</FileName>
|
||||
<FileSize>512KB</FileSize>
|
||||
<SyslogTag>platform</SyslogTag>
|
||||
|
||||
@@ -4140,7 +4140,13 @@
|
||||
<log>
|
||||
<Level>INFO</Level>
|
||||
<Style>level,tag</Style>
|
||||
<OutputDevice>stdout</OutputDevice>
|
||||
{if $fanvil_syslog_enable == '1'}<OutputDevice>syslog</OutputDevice>
|
||||
{elseif $fanvil_output_device == ''}<OutputDevice></OutputDevice>
|
||||
{elseif $fanvil_output_device == 'syslog'}<OutputDevice>syslog</OutputDevice>
|
||||
{elseif $fanvil_output_device == 'stdout'}<OutputDevice>stdout</OutputDevice>
|
||||
{elseif $fanvil_output_device == 'syslog,stdout'}<OutputDevice>syslog,stdout</OutputDevice>
|
||||
{elseif $fanvil_output_device == 'stdout,syslog'}<OutputDevice>syslog,stdout</OutputDevice>
|
||||
{/if}
|
||||
<FileName>platform.log</FileName>
|
||||
<FileSize>512KB</FileSize>
|
||||
<SyslogTag>platform</SyslogTag>
|
||||
|
||||
@@ -3958,7 +3958,13 @@
|
||||
<log>
|
||||
<Level>INFO</Level>
|
||||
<Style>level,tag</Style>
|
||||
<OutputDevice>{if $fanvil_syslog_enable == '1'},syslog{else}stdout{/if}</OutputDevice>
|
||||
{if $fanvil_syslog_enable == '1'}<OutputDevice>syslog</OutputDevice>
|
||||
{elseif $fanvil_output_device == ''}<OutputDevice></OutputDevice>
|
||||
{elseif $fanvil_output_device == 'syslog'}<OutputDevice>syslog</OutputDevice>
|
||||
{elseif $fanvil_output_device == 'stdout'}<OutputDevice>stdout</OutputDevice>
|
||||
{elseif $fanvil_output_device == 'syslog,stdout'}<OutputDevice>syslog,stdout</OutputDevice>
|
||||
{elseif $fanvil_output_device == 'stdout,syslog'}<OutputDevice>syslog,stdout</OutputDevice>
|
||||
{/if}
|
||||
<FileName>platform.log</FileName>
|
||||
<FileSize>512KB</FileSize>
|
||||
<SyslogTag>platform</SyslogTag>
|
||||
|
||||
@@ -4140,7 +4140,13 @@
|
||||
<log>
|
||||
<Level>INFO</Level>
|
||||
<Style>level,tag</Style>
|
||||
<OutputDevice>{if $fanvil_syslog_enable == '1'},syslog{else}stdout{/if}</OutputDevice>
|
||||
{if $fanvil_syslog_enable == '1'}<OutputDevice>syslog</OutputDevice>
|
||||
{elseif $fanvil_output_device == ''}<OutputDevice></OutputDevice>
|
||||
{elseif $fanvil_output_device == 'syslog'}<OutputDevice>syslog</OutputDevice>
|
||||
{elseif $fanvil_output_device == 'stdout'}<OutputDevice>stdout</OutputDevice>
|
||||
{elseif $fanvil_output_device == 'syslog,stdout'}<OutputDevice>syslog,stdout</OutputDevice>
|
||||
{elseif $fanvil_output_device == 'stdout,syslog'}<OutputDevice>syslog,stdout</OutputDevice>
|
||||
{/if}
|
||||
<FileName>platform.log</FileName>
|
||||
<FileSize>512KB</FileSize>
|
||||
<SyslogTag>platform</SyslogTag>
|
||||
|
||||
Reference in New Issue
Block a user