Separated var and data directories.

achaloyan · achaloyan · commit 8f990c46cd14 · 2014-10-08T03:44:33.000Z
The datadir contains read-only data installed with and used by applications. While the vardir is supposed to hold files being created and modified on run-time.

On Windows, the "prepare" project needs to be built in order to create an empty var directory (or just create it manually next to the other subdirs).
diff --git a/Makefile.am b/Makefile.am
@@ -33,3 +33,4 @@ dox:
 
 install-data-local:
 	test -d $(DESTDIR)$(logdir) || $(mkinstalldirs) $(DESTDIR)$(logdir)
+	test -d $(DESTDIR)$(vardir) || $(mkinstalldirs) $(DESTDIR)$(vardir)
diff --git a/build/tools/prepare.vcproj b/build/tools/prepare.vcproj
diff --git a/build/tools/prepare.vcxproj b/build/tools/prepare.vcxproj
@@ -103,6 +103,7 @@ xcopy "$(SolutionDir)conf\client-profiles\*.xml" "$(SolutionDir)$(Configuration)
 
 if not exist "$(SolutionDir)$(Configuration)\data" xcopy "$(SolutionDir)data\*" "$(SolutionDir)$(Configuration)\data\" /Y
 if not exist "$(SolutionDir)$(Configuration)\log" mkdir "$(SolutionDir)$(Configuration)\log\"
+if not exist "$(SolutionDir)$(Configuration)\var" mkdir "$(SolutionDir)$(Configuration)\var\"
 </Command>
     </PreBuildEvent>
   </ItemDefinitionGroup>
@@ -130,6 +131,7 @@ xcopy "$(SolutionDir)conf\client-profiles\*.xml" "$(SolutionDir)$(Platform)\$(Co
 
 if not exist "$(SolutionDir)$(Platform)\$(Configuration)\data" xcopy "$(SolutionDir)data\*" "$(SolutionDir)$(Platform)\$(Configuration)\data\" /Y
 if not exist "$(SolutionDir)$(Platform)\$(Configuration)\log" mkdir "$(SolutionDir)$(Platform)\$(Configuration)\log\"
+if not exist "$(SolutionDir)$(Platform)\$(Configuration)\var" mkdir "$(SolutionDir)$(Platform)\$(Configuration)\var\"
 </Command>
     </PreBuildEvent>
     <Midl>
@@ -160,6 +162,7 @@ xcopy "$(SolutionDir)conf\client-profiles\*.xml" "$(SolutionDir)$(Configuration)
 
 if not exist "$(SolutionDir)$(Configuration)\data" xcopy "$(SolutionDir)data\*" "$(SolutionDir)$(Configuration)\data\" /Y
 if not exist "$(SolutionDir)$(Configuration)\log" mkdir "$(SolutionDir)$(Configuration)\log\"
+if not exist "$(SolutionDir)$(Configuration)\var" mkdir "$(SolutionDir)$(Configuration)\var\"
 </Command>
     </PreBuildEvent>
   </ItemDefinitionGroup>
@@ -187,6 +190,7 @@ xcopy "$(SolutionDir)conf\client-profiles\*.xml" "$(SolutionDir)$(Platform)\$(Co
 
 if not exist "$(SolutionDir)$(Platform)\$(Configuration)\data" xcopy "$(SolutionDir)data\*" "$(SolutionDir)$(Platform)\$(Configuration)\data\" /Y
 if not exist "$(SolutionDir)$(Platform)\$(Configuration)\log" mkdir "$(SolutionDir)$(Platform)\$(Configuration)\log\"
+if not exist "$(SolutionDir)$(Platform)\$(Configuration)\var" mkdir "$(SolutionDir)$(Platform)\$(Configuration)\var\"
 </Command>
     </PreBuildEvent>
     <Midl>
diff --git a/config.layout b/config.layout
@@ -19,6 +19,7 @@
     datadir:         ${prefix}/data
     plugindir:       ${exec_prefix}/plugin
     logdir:          ${exec_prefix}/log
+    vardir:          ${exec_prefix}/var
     installbuilddir: ${exec_prefix}/build
     includedir:      ${prefix}/include
     localstatedir:   ${prefix}
diff --git a/configure.ac b/configure.ac
@@ -27,9 +27,10 @@ sinclude(build/acmacros/lt~obsolete.m4)
 AC_PREFIX_DEFAULT(/usr/local/unimrcp)
 
 dnl Define the directory layout.
-APR_ENABLE_LAYOUT(classic, [plugindir logdir])
+APR_ENABLE_LAYOUT(classic, [plugindir logdir vardir])
 AC_SUBST(plugindir)
 AC_SUBST(logdir)
+AC_SUBST(vardir)
 
 dnl Reparse the configure arguments.
 APR_PARSE_ARGUMENTS
diff --git a/libs/apr-toolkit/include/apt_dir_layout.h b/libs/apr-toolkit/include/apt_dir_layout.h
@@ -41,6 +41,8 @@ struct apt_dir_layout_t {
 	char *log_dir_path;
 	/** Path to data dir */
 	char *data_dir_path;
+	/** Path to var dir */
+	char *var_dir_path;
 };
 
 /**
@@ -56,13 +58,17 @@ APT_DECLARE(apt_dir_layout_t*) apt_custom_dir_layout_create(
 									const char *plugin_dir_path,
 									const char *log_dir_path,
 									const char *data_dir_path,
+									const char *var_dir_path,
 									apr_pool_t *pool);
 
+/** Construct file path relative to conf dir using the file name specified. */
+APT_DECLARE(char*) apt_confdir_filepath_get(const apt_dir_layout_t *dir_layout, const char *file_name, apr_pool_t *pool);
+
 /** Construct file path relative to data dir using the file name specified. */
 APT_DECLARE(char*) apt_datadir_filepath_get(const apt_dir_layout_t *dir_layout, const char *file_name, apr_pool_t *pool);
 
-/** Construct file path relative to conf dir using the file name specified. */
-APT_DECLARE(char*) apt_confdir_filepath_get(const apt_dir_layout_t *dir_layout, const char *file_name, apr_pool_t *pool);
+/** Construct file path relative to var dir using the file name specified. */
+APT_DECLARE(char*) apt_vardir_filepath_get(const apt_dir_layout_t *dir_layout, const char *file_name, apr_pool_t *pool);
 
 
 APT_END_EXTERN_C
diff --git a/libs/apr-toolkit/src/apt_dir_layout.c b/libs/apr-toolkit/src/apt_dir_layout.c
@@ -26,6 +26,7 @@ static apt_dir_layout_t* apt_dir_layout_alloc(apr_pool_t *pool)
 	dir_layout->plugin_dir_path = NULL;
 	dir_layout->log_dir_path = NULL;
 	dir_layout->data_dir_path = NULL;
+	dir_layout->var_dir_path = NULL;
 	return dir_layout;
 }
 
@@ -37,6 +38,7 @@ APT_DECLARE(apt_dir_layout_t*) apt_default_dir_layout_create(const char *root_di
 		apr_filepath_merge(&dir_layout->plugin_dir_path,root_dir_path,"plugin",0,pool);
 		apr_filepath_merge(&dir_layout->log_dir_path,root_dir_path,"log",0,pool);
 		apr_filepath_merge(&dir_layout->data_dir_path,root_dir_path,"data",0,pool);
+		apr_filepath_merge(&dir_layout->var_dir_path,root_dir_path,"var",0,pool);
 	}
 	return dir_layout;
 }
@@ -46,6 +48,7 @@ APT_DECLARE(apt_dir_layout_t*) apt_custom_dir_layout_create(
 									const char *plugin_dir_path,
 									const char *log_dir_path,
 									const char *data_dir_path,
+									const char *var_dir_path,
 									apr_pool_t *pool)
 {
 	apt_dir_layout_t *dir_layout = apt_dir_layout_alloc(pool);
@@ -61,9 +64,23 @@ APT_DECLARE(apt_dir_layout_t*) apt_custom_dir_layout_create(
 	if(data_dir_path) {
 		dir_layout->data_dir_path = apr_pstrdup(pool,data_dir_path);
 	}
+	if(var_dir_path) {
+		dir_layout->var_dir_path = apr_pstrdup(pool,var_dir_path);
+	}
 	return dir_layout;
 }
 
+APT_DECLARE(char*) apt_confdir_filepath_get(const apt_dir_layout_t *dir_layout, const char *file_name, apr_pool_t *pool)
+{
+	if(dir_layout && dir_layout->conf_dir_path && file_name) {
+		char *file_path = NULL;
+		if(apr_filepath_merge(&file_path,dir_layout->conf_dir_path,file_name,0,pool) == APR_SUCCESS) {
+			return file_path;
+		}
+	}
+	return NULL;
+}
+
 APT_DECLARE(char*) apt_datadir_filepath_get(const apt_dir_layout_t *dir_layout, const char *file_name, apr_pool_t *pool)
 {
 	if(dir_layout && dir_layout->data_dir_path && file_name) {
@@ -75,11 +92,11 @@ APT_DECLARE(char*) apt_datadir_filepath_get(const apt_dir_layout_t *dir_layout,
 	return NULL;
 }
 
-APT_DECLARE(char*) apt_confdir_filepath_get(const apt_dir_layout_t *dir_layout, const char *file_name, apr_pool_t *pool)
+APT_DECLARE(char*) apt_vardir_filepath_get(const apt_dir_layout_t *dir_layout, const char *file_name, apr_pool_t *pool)
 {
-	if(dir_layout && dir_layout->conf_dir_path && file_name) {
+	if(dir_layout && dir_layout->var_dir_path && file_name) {
 		char *file_path = NULL;
-		if(apr_filepath_merge(&file_path,dir_layout->conf_dir_path,file_name,0,pool) == APR_SUCCESS) {
+		if(apr_filepath_merge(&file_path,dir_layout->var_dir_path,file_name,0,pool) == APR_SUCCESS) {
 			return file_path;
 		}
 	}
diff --git a/platforms/umc/src/synthsession.cpp b/platforms/umc/src/synthsession.cpp
@@ -281,11 +281,19 @@ mrcp_message_t* SynthSession::CreateSpeakRequest(mrcp_channel_t* pMrcpChannel)
 
 FILE* SynthSession::GetAudioOut(const mpf_codec_descriptor_t* pDescriptor, apr_pool_t* pool) const
 {
+	FILE* file;
 	char* pFileName = apr_psprintf(pool,"synth-%dkHz-%s.pcm",pDescriptor->sampling_rate/1000, GetMrcpSessionId());
 	apt_dir_layout_t* pDirLayout = GetScenario()->GetDirLayout();
-	char* pFilePath = apt_datadir_filepath_get(pDirLayout,pFileName,pool);
-	if(!pFilePath) 
+	char* pFilePath = apt_vardir_filepath_get(pDirLayout,pFileName,pool);
+	if(!pFilePath)
 		return NULL;
 
-	return fopen(pFilePath,"wb");
+	apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Open Speech Output File [%s] for Writing",pFilePath);
+	file = fopen(pFilePath,"wb");
+	if(!file)
+	{
+		apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Failed to Open Speech Output File [%s] for Writing",pFilePath);
+		return NULL;
+	}
+	return file;
 }
diff --git a/platforms/unimrcp-client/src/demo_synth_application.c b/platforms/unimrcp-client/src/demo_synth_application.c
@@ -223,9 +223,13 @@ static apt_bool_t synth_application_on_channel_add(mrcp_application_t *applicati
 			char *file_name = apr_psprintf(pool,"synth-%dkHz-%s.pcm",
 									descriptor->sampling_rate/1000,
 									id->buf);
-			char *file_path = apt_datadir_filepath_get(dir_layout,file_name,pool);
+			char *file_path = apt_vardir_filepath_get(dir_layout,file_name,pool);
 			if(file_path) {
+				apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Open Speech Output File [%s] for Writing",file_path);
 				synth_channel->audio_out = fopen(file_path,"wb");
+				if(!synth_channel->audio_out) {
+					apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Failed to Open Utterance Output File [%s] for Writing",file_path);
+				}
 			}
 		}
 	}
diff --git a/plugins/demo-recog/src/demo_recog_engine.c b/plugins/demo-recog/src/demo_recog_engine.c
@@ -289,9 +289,13 @@ static apt_bool_t demo_recog_channel_recognize(mrcp_engine_channel_t *channel, m
 		char *file_name = apr_psprintf(channel->pool,"utter-%dkHz-%s.pcm",
 							descriptor->sampling_rate/1000,
 							request->channel_id.session_id.buf);
-		char *file_path = apt_datadir_filepath_get(dir_layout,file_name,channel->pool);
+		char *file_path = apt_vardir_filepath_get(dir_layout,file_name,channel->pool);
 		if(file_path) {
+			apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Open Utterance Output File [%s] for Writing",file_path);
 			recog_channel->audio_out = fopen(file_path,"wb");
+			if(!recog_channel->audio_out) {
+				apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Failed to Open Utterance Output File [%s] for Writing",file_path);
+			}
 		}
 	}
 
diff --git a/plugins/demo-verifier/src/demo_verifier_engine.c b/plugins/demo-verifier/src/demo_verifier_engine.c
@@ -291,9 +291,13 @@ static apt_bool_t demo_verifier_channel_verify(mrcp_engine_channel_t *channel, m
 		char *file_name = apr_psprintf(channel->pool,"voiceprint-%dkHz-%s.pcm",
 							descriptor->sampling_rate/1000,
 							request->channel_id.session_id.buf);
-		char *file_path = apt_datadir_filepath_get(dir_layout,file_name,channel->pool);
+		char *file_path = apt_vardir_filepath_get(dir_layout,file_name,channel->pool);
 		if(file_path) {
+			apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Open Utterance Output File [%s] for Writing",file_path);
 			verifier_channel->audio_out = fopen(file_path,"wb");
+			if(!verifier_channel->audio_out) {
+				apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Failed to Open Utterance Output File [%s] for Writing",file_path);
+			}
 		}
 	}
 
diff --git a/plugins/mrcp-recorder/src/mrcp_recorder_engine.c b/plugins/mrcp-recorder/src/mrcp_recorder_engine.c
@@ -221,7 +221,7 @@ static apt_bool_t recorder_file_open(recorder_channel_t *recorder_channel, mrcp_
 		descriptor->sampling_rate/1000,
 		request->channel_id.session_id.buf,
 		request->start_line.request_id);
-	file_path = apt_datadir_filepath_get(dir_layout,file_name,channel->pool);
+	file_path = apt_vardir_filepath_get(dir_layout,file_name,channel->pool);
 	if(!file_path) {
 		return FALSE;
 	}
@@ -231,8 +231,10 @@ static apt_bool_t recorder_file_open(recorder_channel_t *recorder_channel, mrcp_
 		recorder_channel->audio_out = NULL;
 	}
 
+	apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Open Utterance Output File [%s] for Writing",file_path);
 	recorder_channel->audio_out = fopen(file_path,"wb");
 	if(!recorder_channel->audio_out) {
+		apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Failed to Open Utterance Output File [%s] for Writing",file_path);
 		return FALSE;
 	}
 
diff --git a/tests/mpftest/src/mpf_suite.c b/tests/mpftest/src/mpf_suite.c
@@ -446,13 +446,14 @@ static mpf_audio_file_descriptor_t* mpf_file_reader_descriptor_create(const mpf_
 /** Create file writer descriptor */
 static mpf_audio_file_descriptor_t* mpf_file_writer_descriptor_create(const mpf_suite_agent_t *agent, const mpf_suite_session_t *session)
 {
-	const char *file_path = apt_datadir_filepath_get(agent->dir_layout,"output-8kHz.pcm",session->pool);
+	const char *file_path = apt_vardir_filepath_get(agent->dir_layout,"output-8kHz.pcm",session->pool);
 	mpf_audio_file_descriptor_t *descriptor = apr_palloc(session->pool,sizeof(mpf_audio_file_descriptor_t));
 	descriptor->mask = FILE_WRITER;
 	descriptor->max_write_size = 500000; /* ~500Kb */
+	apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Open File [%s] for Writing",file_path);
 	descriptor->write_handle = fopen(file_path,"wb");
 	if(!descriptor->write_handle) {
-		apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Failed to Open File [%s]",file_path);
+		apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Failed to Open File [%s] for Writing",file_path);
 	}
 	descriptor->read_handle = NULL;
 	descriptor->codec_descriptor = mpf_codec_lpcm_descriptor_create(8000,1,session->pool);

Original file line number	Diff line number	Diff line change
`@@ -33,3 +33,4 @@ dox:`
`33`	`33`
`34`	`34`	`install-data-local:`
`35`	`35`	`test -d $(DESTDIR)$(logdir) \|\| $(mkinstalldirs) $(DESTDIR)$(logdir)`
	`36`	`+ test -d $(DESTDIR)$(vardir) \|\| $(mkinstalldirs) $(DESTDIR)$(vardir)`
Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,7 @@ static apt_dir_layout_t* apt_dir_layout_alloc(apr_pool_t *pool)`
`26`	`26`	`dir_layout->plugin_dir_path = NULL;`
`27`	`27`	`dir_layout->log_dir_path = NULL;`
`28`	`28`	`dir_layout->data_dir_path = NULL;`
	`29`	`+ dir_layout->var_dir_path = NULL;`
`29`	`30`	`return dir_layout;`
`30`	`31`	`}`
`31`	`32`
`@@ -37,6 +38,7 @@ APT_DECLARE(apt_dir_layout_t) apt_default_dir_layout_create(const char root_di`
`37`	`38`	`apr_filepath_merge(&dir_layout->plugin_dir_path,root_dir_path,"plugin",0,pool);`
`38`	`39`	`apr_filepath_merge(&dir_layout->log_dir_path,root_dir_path,"log",0,pool);`
`39`	`40`	`apr_filepath_merge(&dir_layout->data_dir_path,root_dir_path,"data",0,pool);`
	`41`	`+ apr_filepath_merge(&dir_layout->var_dir_path,root_dir_path,"var",0,pool);`
`40`	`42`	`}`
`41`	`43`	`return dir_layout;`
`42`	`44`	`}`
`@@ -46,6 +48,7 @@ APT_DECLARE(apt_dir_layout_t*) apt_custom_dir_layout_create(`
`46`	`48`	`const char *plugin_dir_path,`
`47`	`49`	`const char *log_dir_path,`
`48`	`50`	`const char *data_dir_path,`
	`51`	`+ const char *var_dir_path,`
`49`	`52`	`apr_pool_t *pool)`
`50`	`53`	`{`
`51`	`54`	`apt_dir_layout_t *dir_layout = apt_dir_layout_alloc(pool);`
`@@ -61,9 +64,23 @@ APT_DECLARE(apt_dir_layout_t*) apt_custom_dir_layout_create(`
`61`	`64`	`if(data_dir_path) {`
`62`	`65`	`dir_layout->data_dir_path = apr_pstrdup(pool,data_dir_path);`
`63`	`66`	`}`
	`67`	`+ if(var_dir_path) {`
	`68`	`+ dir_layout->var_dir_path = apr_pstrdup(pool,var_dir_path);`
	`69`	`+ }`
`64`	`70`	`return dir_layout;`
`65`	`71`	`}`
`66`	`72`
	`73`	`+APT_DECLARE(char) apt_confdir_filepath_get(const apt_dir_layout_t dir_layout, const char file_name, apr_pool_t pool)`
	`74`	`+{`
	`75`	`+ if(dir_layout && dir_layout->conf_dir_path && file_name) {`
	`76`	`+ char *file_path = NULL;`
	`77`	`+ if(apr_filepath_merge(&file_path,dir_layout->conf_dir_path,file_name,0,pool) == APR_SUCCESS) {`
	`78`	`+ return file_path;`
	`79`	`+ }`
	`80`	`+ }`
	`81`	`+ return NULL;`
	`82`	`+}`
	`83`	`+`
`67`	`84`	`APT_DECLARE(char) apt_datadir_filepath_get(const apt_dir_layout_t dir_layout, const char file_name, apr_pool_t pool)`
`68`	`85`	`{`
`69`	`86`	`if(dir_layout && dir_layout->data_dir_path && file_name) {`
`@@ -75,11 +92,11 @@ APT_DECLARE(char) apt_datadir_filepath_get(const apt_dir_layout_t dir_layout,`
`75`	`92`	`return NULL;`
`76`	`93`	`}`
`77`	`94`
`78`		`-APT_DECLARE(char) apt_confdir_filepath_get(const apt_dir_layout_t dir_layout, const char file_name, apr_pool_t pool)`
	`95`	`+APT_DECLARE(char) apt_vardir_filepath_get(const apt_dir_layout_t dir_layout, const char file_name, apr_pool_t pool)`
`79`	`96`	`{`
`80`		`- if(dir_layout && dir_layout->conf_dir_path && file_name) {`
	`97`	`+ if(dir_layout && dir_layout->var_dir_path && file_name) {`
`81`	`98`	`char *file_path = NULL;`
`82`		`- if(apr_filepath_merge(&file_path,dir_layout->conf_dir_path,file_name,0,pool) == APR_SUCCESS) {`
	`99`	`+ if(apr_filepath_merge(&file_path,dir_layout->var_dir_path,file_name,0,pool) == APR_SUCCESS) {`
`83`	`100`	`return file_path;`
`84`	`101`	`}`
`85`	`102`	`}`
Original file line number	Diff line number	Diff line change
`@@ -223,9 +223,13 @@ static apt_bool_t synth_application_on_channel_add(mrcp_application_t *applicati`
`223`	`223`	`char *file_name = apr_psprintf(pool,"synth-%dkHz-%s.pcm",`
`224`	`224`	`descriptor->sampling_rate/1000,`
`225`	`225`	`id->buf);`
`226`		`- char *file_path = apt_datadir_filepath_get(dir_layout,file_name,pool);`
	`226`	`+ char *file_path = apt_vardir_filepath_get(dir_layout,file_name,pool);`
`227`	`227`	`if(file_path) {`
	`228`	`+ apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Open Speech Output File [%s] for Writing",file_path);`
`228`	`229`	`synth_channel->audio_out = fopen(file_path,"wb");`
	`230`	`+ if(!synth_channel->audio_out) {`
	`231`	`+ apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Failed to Open Utterance Output File [%s] for Writing",file_path);`
	`232`	`+ }`
`229`	`233`	`}`
`230`	`234`	`}`
`231`	`235`	`}`
Original file line number	Diff line number	Diff line change
`@@ -289,9 +289,13 @@ static apt_bool_t demo_recog_channel_recognize(mrcp_engine_channel_t *channel, m`
`289`	`289`	`char *file_name = apr_psprintf(channel->pool,"utter-%dkHz-%s.pcm",`
`290`	`290`	`descriptor->sampling_rate/1000,`
`291`	`291`	`request->channel_id.session_id.buf);`
`292`		`- char *file_path = apt_datadir_filepath_get(dir_layout,file_name,channel->pool);`
	`292`	`+ char *file_path = apt_vardir_filepath_get(dir_layout,file_name,channel->pool);`
`293`	`293`	`if(file_path) {`
	`294`	`+ apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Open Utterance Output File [%s] for Writing",file_path);`
`294`	`295`	`recog_channel->audio_out = fopen(file_path,"wb");`
	`296`	`+ if(!recog_channel->audio_out) {`
	`297`	`+ apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Failed to Open Utterance Output File [%s] for Writing",file_path);`
	`298`	`+ }`
`295`	`299`	`}`
`296`	`300`	`}`
`297`	`301`
Original file line number	Diff line number	Diff line change
`@@ -291,9 +291,13 @@ static apt_bool_t demo_verifier_channel_verify(mrcp_engine_channel_t *channel, m`
`291`	`291`	`char *file_name = apr_psprintf(channel->pool,"voiceprint-%dkHz-%s.pcm",`
`292`	`292`	`descriptor->sampling_rate/1000,`
`293`	`293`	`request->channel_id.session_id.buf);`
`294`		`- char *file_path = apt_datadir_filepath_get(dir_layout,file_name,channel->pool);`
	`294`	`+ char *file_path = apt_vardir_filepath_get(dir_layout,file_name,channel->pool);`
`295`	`295`	`if(file_path) {`
	`296`	`+ apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Open Utterance Output File [%s] for Writing",file_path);`
`296`	`297`	`verifier_channel->audio_out = fopen(file_path,"wb");`
	`298`	`+ if(!verifier_channel->audio_out) {`
	`299`	`+ apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Failed to Open Utterance Output File [%s] for Writing",file_path);`
	`300`	`+ }`
`297`	`301`	`}`
`298`	`302`	`}`
`299`	`303`
Original file line number	Diff line number	Diff line change
`@@ -221,7 +221,7 @@ static apt_bool_t recorder_file_open(recorder_channel_t *recorder_channel, mrcp_`
`221`	`221`	`descriptor->sampling_rate/1000,`
`222`	`222`	`request->channel_id.session_id.buf,`
`223`	`223`	`request->start_line.request_id);`
`224`		`- file_path = apt_datadir_filepath_get(dir_layout,file_name,channel->pool);`
	`224`	`+ file_path = apt_vardir_filepath_get(dir_layout,file_name,channel->pool);`
`225`	`225`	`if(!file_path) {`
`226`	`226`	`return FALSE;`
`227`	`227`	`}`
`@@ -231,8 +231,10 @@ static apt_bool_t recorder_file_open(recorder_channel_t *recorder_channel, mrcp_`
`231`	`231`	`recorder_channel->audio_out = NULL;`
`232`	`232`	`}`
`233`	`233`
	`234`	`+ apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Open Utterance Output File [%s] for Writing",file_path);`
`234`	`235`	`recorder_channel->audio_out = fopen(file_path,"wb");`
`235`	`236`	`if(!recorder_channel->audio_out) {`
	`237`	`+ apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Failed to Open Utterance Output File [%s] for Writing",file_path);`
`236`	`238`	`return FALSE;`
`237`	`239`	`}`
`238`	`240`