@@ -7,10 +7,10 @@ HTTP_MODULE_ID CModuleConfiguration::moduleId = NULL;
77BOOL CModuleConfiguration::invalid = FALSE ;
88
99CModuleConfiguration::CModuleConfiguration ()
10- : nodeProcessCommandLine(NULL ), logDirectoryNameSuffix (NULL ), debuggerPathSegment(NULL ),
10+ : nodeProcessCommandLine(NULL ), logDirectory (NULL ), debuggerPathSegment(NULL ),
1111 debugPortRange(NULL ), debugPortStart(0 ), debugPortEnd(0 ), node_env(NULL ), watchedFiles(NULL ),
1212 enableXFF(FALSE ), promoteServerVars(NULL ), promoteServerVarsRaw(NULL ), configOverridesFileName(NULL ),
13- configOverrides(NULL )
13+ configOverrides(NULL ), interceptor( NULL )
1414{
1515 InitializeSRWLock (&this ->srwlock );
1616}
@@ -23,10 +23,15 @@ CModuleConfiguration::~CModuleConfiguration()
2323 this ->nodeProcessCommandLine = NULL ;
2424 }
2525
26- if (NULL != this ->logDirectoryNameSuffix )
26+ if (NULL != this ->interceptor ) {
27+ delete [] this ->interceptor ;
28+ this ->interceptor = NULL ;
29+ }
30+
31+ if (NULL != this ->logDirectory )
2732 {
28- delete [] this ->logDirectoryNameSuffix ;
29- this ->logDirectoryNameSuffix = NULL ;
33+ delete [] this ->logDirectory ;
34+ this ->logDirectory = NULL ;
3035 }
3136
3237 if (NULL != this ->debuggerPathSegment )
@@ -240,6 +245,48 @@ HRESULT CModuleConfiguration::CreateNodeEnvironment(IHttpContext* ctx, DWORD deb
240245 tmpIndex += propertySize + 1 ;
241246 }
242247
248+ if (CModuleConfiguration::GetLoggingEnabled (ctx))
249+ {
250+ // set IISNODE_LOGGINGENABLED variable
251+
252+ ErrorIf ((tmpSize - (tmpIndex - tmpStart)) < 25 , ERROR_NOT_ENOUGH_MEMORY);
253+ sprintf (tmpIndex, " IISNODE_LOGGINGENABLED=1"
254+ tmpIndex += 25 ;
255+
256+ // set IISNODE_LOGDIRECTORY variable based on the iisnode/@logDirectory configuration setting, if not empty
257+
258+ LPWSTR logDirectory = CModuleConfiguration::GetLogDirectory (ctx);
259+ if (0 != wcscmp (L" "
260+ {
261+ ErrorIf ((tmpSize - (tmpIndex - tmpStart)) < 22 , ERROR_NOT_ENOUGH_MEMORY);
262+ sprintf (tmpIndex, " IISNODE_LOGDIRECTORY="
263+ tmpIndex += 21 ;
264+ ErrorIf (0 == (propertySize = WideCharToMultiByte (CP_ACP, 0 , logDirectory, wcslen (logDirectory), NULL , 0 , NULL , NULL )), E_FAIL);
265+ ErrorIf ((propertySize + 1 ) > (tmpSize - (tmpStart - tmpIndex)), ERROR_NOT_ENOUGH_MEMORY);
266+ ErrorIf (propertySize != WideCharToMultiByte (CP_ACP, 0 , logDirectory, wcslen (logDirectory), tmpIndex, propertySize, NULL , NULL ), E_FAIL);
267+ tmpIndex += propertySize + 1 ;
268+ }
269+
270+ // set IISNODE_MAXTOTALLOGFILESIZEINKB, IISNODE_MAXLOGFILESIZEINKB, and IISNODE_MAXLOGFILES variables
271+
272+ char tmp[64 ];
273+ sprintf (tmp, " %d" CModuleConfiguration::GetMaxTotalLogFileSizeInKB (ctx));
274+ ErrorIf ((tmpSize - (tmpIndex - tmpStart)) < (strlen (tmp) + 33 ), ERROR_NOT_ENOUGH_MEMORY);
275+ sprintf (tmpIndex, " IISNODE_MAXTOTALLOGFILESIZEINKB=%s"
276+ tmpIndex += strlen (tmp) + 33 ;
277+
278+ sprintf (tmp, " %d" CModuleConfiguration::GetMaxLogFileSizeInKB (ctx));
279+ ErrorIf ((tmpSize - (tmpIndex - tmpStart)) < (strlen (tmp) + 28 ), ERROR_NOT_ENOUGH_MEMORY);
280+ sprintf (tmpIndex, " IISNODE_MAXLOGFILESIZEINKB=%s"
281+ tmpIndex += strlen (tmp) + 28 ;
282+
283+ sprintf (tmp, " %d" CModuleConfiguration::GetMaxLogFiles (ctx));
284+ ErrorIf ((tmpSize - (tmpIndex - tmpStart)) < (strlen (tmp) + 21 ), ERROR_NOT_ENOUGH_MEMORY);
285+ sprintf (tmpIndex, " IISNODE_MAXLOGFILES=%s"
286+ tmpIndex += strlen (tmp) + 21 ;
287+
288+ }
289+
243290 // add a trailing zero to new variables
244291
245292 ErrorIf (1 > (tmpSize - (tmpStart - tmpIndex)), ERROR_NOT_ENOUGH_MEMORY);
@@ -584,21 +631,21 @@ HRESULT CModuleConfiguration::ApplyConfigOverrideKeyValue(IHttpContext* context,
584631 {
585632 CheckError (GetDWORD (valueStart, &config->gracefulShutdownTimeout ));
586633 }
587- else if (0 == strcmpi (keyStart, " logFileFlushInterval "
634+ else if (0 == strcmpi (keyStart, " maxTotalLogFileSizeInKB "
588635 {
589- CheckError (GetDWORD (valueStart, &config->logFileFlushInterval ));
636+ CheckError (GetDWORD (valueStart, &config->maxTotalLogFileSizeInKB ));
590637 }
591638 else if (0 == strcmpi (keyStart, " maxLogFileSizeInKB"
592639 {
593640 CheckError (GetDWORD (valueStart, &config->maxLogFileSizeInKB ));
594641 }
595- else if (0 == strcmpi (keyStart, " loggingEnabled "
642+ else if (0 == strcmpi (keyStart, " maxLogFiles "
596643 {
597- CheckError (GetBOOL (valueStart, &config->loggingEnabled ));
644+ CheckError (GetDWORD (valueStart, &config->maxLogFiles ));
598645 }
599- else if (0 == strcmpi (keyStart, " appendToExistingLog "
646+ else if (0 == strcmpi (keyStart, " loggingEnabled "
600647 {
601- CheckError (GetBOOL (valueStart, &config->appendToExistingLog ));
648+ CheckError (GetBOOL (valueStart, &config->loggingEnabled ));
602649 }
603650 else if (0 == strcmpi (keyStart, " devErrorsEnabled"
604651 {
@@ -616,9 +663,9 @@ HRESULT CModuleConfiguration::ApplyConfigOverrideKeyValue(IHttpContext* context,
616663 {
617664 CheckError (GetBOOL (valueStart, &config->enableXFF ));
618665 }
619- else if (0 == strcmpi (keyStart, " logDirectoryNameSuffix "
666+ else if (0 == strcmpi (keyStart, " logDirectory "
620667 {
621- CheckError (GetString (valueStart, &config->logDirectoryNameSuffix ));
668+ CheckError (GetString (valueStart, &config->logDirectory ));
622669 }
623670 else if (0 == strcmpi (keyStart, " node_env"
624671 {
@@ -659,7 +706,24 @@ HRESULT CModuleConfiguration::ApplyConfigOverrideKeyValue(IHttpContext* context,
659706 strcpy (config->nodeProcessCommandLine , " "
660707 }
661708 }
709+ else if (0 == strcmpi (keyStart, " interceptor"
710+ {
711+ if (config->interceptor )
712+ {
713+ delete [] config->interceptor ;
714+ config->interceptor = NULL ;
715+ }
662716
717+ ErrorIf (NULL == (config->interceptor = new char [MAX_PATH]), ERROR_NOT_ENOUGH_MEMORY);
718+ if (valueStart)
719+ {
720+ strcpy (config->interceptor , valueStart);
721+ }
722+ else
723+ {
724+ strcpy (config->interceptor , " "
725+ }
726+ }
663727
664728 return S_OK;
665729Error:
@@ -996,13 +1060,13 @@ HRESULT CModuleConfiguration::GetConfig(IHttpContext* context, CModuleConfigurat
9961060 CheckError (GetDWORD (section, L" maxRequestBufferSize" maxRequestBufferSize ));
9971061 CheckError (GetDWORD (section, L" uncFileChangesPollingInterval" uncFileChangesPollingInterval ));
9981062 CheckError (GetDWORD (section, L" gracefulShutdownTimeout" gracefulShutdownTimeout ));
999- CheckError (GetDWORD (section, L" logFileFlushInterval " logFileFlushInterval ));
1063+ CheckError (GetDWORD (section, L" maxTotalLogFileSizeInKB " maxTotalLogFileSizeInKB ));
10001064 CheckError (GetDWORD (section, L" maxLogFileSizeInKB" maxLogFileSizeInKB ));
1065+ CheckError (GetDWORD (section, L" maxLogFiles" maxLogFiles ));
10011066 CheckError (GetBOOL (section, L" loggingEnabled" loggingEnabled ));
1002- CheckError (GetBOOL (section, L" appendToExistingLog" appendToExistingLog ));
10031067 CheckError (GetBOOL (section, L" devErrorsEnabled" devErrorsEnabled ));
10041068 CheckError (GetBOOL (section, L" flushResponse" flushResponse ));
1005- CheckError (GetString (section, L" logDirectoryNameSuffix " logDirectoryNameSuffix ));
1069+ CheckError (GetString (section, L" logDirectory " logDirectory ));
10061070 CheckError (GetBOOL (section, L" debuggingEnabled" debuggingEnabled ));
10071071 CheckError (GetString (section, L" node_env" node_env ));
10081072 CheckError (GetString (section, L" debuggerPortRange" debugPortRange ));
@@ -1024,6 +1088,14 @@ HRESULT CModuleConfiguration::GetConfig(IHttpContext* context, CModuleConfigurat
10241088 delete [] commandLine;
10251089 commandLine = NULL ;
10261090
1091+ // interceptor
1092+
1093+ CheckError (GetString (section, L" interceptor"
1094+ ErrorIf (NULL == (c->interceptor = new char [MAX_PATH]), ERROR_NOT_ENOUGH_MEMORY);
1095+ ErrorIf (0 != wcstombs_s (&i, c->interceptor , (size_t )MAX_PATH, commandLine, _TRUNCATE), ERROR_INVALID_PARAMETER);
1096+ delete [] commandLine;
1097+ commandLine = NULL ;
1098+
10271099 // apply config setting overrides from the optional YAML configuration file
10281100
10291101 CheckError (CModuleConfiguration::ApplyYamlConfigOverrides (context, c));
@@ -1097,6 +1169,11 @@ LPCTSTR CModuleConfiguration::GetNodeProcessCommandLine(IHttpContext* ctx)
10971169 GETCONFIG (nodeProcessCommandLine)
10981170}
10991171
1172+ LPCTSTR CModuleConfiguration::GetInterceptor (IHttpContext* ctx)
1173+ {
1174+ GETCONFIG (interceptor)
1175+ }
1176+
11001177DWORD CModuleConfiguration::GetMaxConcurrentRequestsPerProcess (IHttpContext* ctx)
11011178{
11021179 GETCONFIG (maxConcurrentRequestsPerProcess)
@@ -1132,9 +1209,9 @@ DWORD CModuleConfiguration::GetGracefulShutdownTimeout(IHttpContext* ctx)
11321209 GETCONFIG (gracefulShutdownTimeout)
11331210}
11341211
1135- LPWSTR CModuleConfiguration::GetLogDirectoryNameSuffix (IHttpContext* ctx)
1212+ LPWSTR CModuleConfiguration::GetLogDirectory (IHttpContext* ctx)
11361213{
1137- GETCONFIG (logDirectoryNameSuffix )
1214+ GETCONFIG (logDirectory )
11381215}
11391216
11401217LPWSTR CModuleConfiguration::GetDebuggerPathSegment (IHttpContext* ctx)
@@ -1147,24 +1224,24 @@ DWORD CModuleConfiguration::GetDebuggerPathSegmentLength(IHttpContext* ctx)
11471224 GETCONFIG (debuggerPathSegmentLength)
11481225}
11491226
1150- DWORD CModuleConfiguration::GetLogFileFlushInterval (IHttpContext* ctx)
1227+ DWORD CModuleConfiguration::GetMaxTotalLogFileSizeInKB (IHttpContext* ctx)
11511228{
1152- GETCONFIG (logFileFlushInterval )
1229+ GETCONFIG (maxTotalLogFileSizeInKB )
11531230}
11541231
11551232DWORD CModuleConfiguration::GetMaxLogFileSizeInKB (IHttpContext* ctx)
11561233{
11571234 GETCONFIG (maxLogFileSizeInKB)
11581235}
11591236
1160- BOOL CModuleConfiguration::GetLoggingEnabled (IHttpContext* ctx)
1237+ DWORD CModuleConfiguration::GetMaxLogFiles (IHttpContext* ctx)
11611238{
1162- GETCONFIG (loggingEnabled);
1239+ GETCONFIG (maxLogFiles)
11631240}
11641241
1165- BOOL CModuleConfiguration::GetAppendToExistingLog (IHttpContext* ctx)
1242+ BOOL CModuleConfiguration::GetLoggingEnabled (IHttpContext* ctx)
11661243{
1167- GETCONFIG (appendToExistingLog)
1244+ GETCONFIG (loggingEnabled);
11681245}
11691246
11701247BOOL CModuleConfiguration::GetDebuggingEnabled (IHttpContext* ctx)
0 commit comments