svn commit: r945730 - in /trafficserver/traffic/trunk/iocore/cache: Cache.cc CacheHosting.cc

[mt...@apache.org]

Author: mturk
Date: Tue May 18 16:12:16 2010
New Revision: 945730

URL: http://svn.apache.org/viewvc?rev=945730&view=rev
Log:
Axe hard coded paths from cache

Modified:
    trafficserver/traffic/trunk/iocore/cache/Cache.cc
    trafficserver/traffic/trunk/iocore/cache/CacheHosting.cc

Modified: trafficserver/traffic/trunk/iocore/cache/Cache.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/cache/Cache.cc?rev=945730&r1=945729&r2=945730&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/cache/Cache.cc (original)
+++ trafficserver/traffic/trunk/iocore/cache/Cache.cc Tue May 18 16:12:16 2010
@@ -32,6 +32,8 @@
 #include "StatPages.h"
 #endif
 
+#include "I_Layout.h"
+
 #ifdef HTTP_CACHE
 #include "HttpTransactCache.h"
 #include "HttpSM.h"
@@ -2648,19 +2650,19 @@ ink_cache_init(ModuleVersion v)
 
   IOCORE_RegisterConfigString(RECT_CONFIG, "proxy.config.config_dir", SYSCONFDIR, RECU_DYNAMIC, RECC_NULL, NULL);
   IOCORE_ReadConfigString(cache_system_config_directory, "proxy.config.config_dir", PATH_NAME_MAX);
+  if (cache_system_config_directory[0] != '/') {
+    // Not an absolute path so use system one
+    ink_strncpy(cache_system_config_directory, system_config_directory, sizeof(cache_system_config_directory));
+  }
   Debug("cache_init", "proxy.config.config_dir = \"%s\"", cache_system_config_directory);
   if ((ierr = stat(cache_system_config_directory, &s)) < 0) {
-    ink_strncpy(cache_system_config_directory,system_config_directory,sizeof(cache_system_config_directory));
+    ink_strncpy(cache_system_config_directory, Layout::get()->sysconfdir,
+                sizeof(cache_system_config_directory));
     if ((ierr = stat(cache_system_config_directory, &s)) < 0) {
-      // Try 'system_root_dir/etc/trafficserver' directory
-      snprintf(cache_system_config_directory, sizeof(cache_system_config_directory),
-               "%s%s%s%s%s",system_root_dir, DIR_SEP,"etc",DIR_SEP,"trafficserver");
-      if ((ierr = stat(cache_system_config_directory, &s)) < 0) {
-        fprintf(stderr,"unable to stat() config dir '%s': %d %d, %s\n",
-                cache_system_config_directory, ierr, errno, strerror(errno));
-        fprintf(stderr, "please set config path via 'proxy.config.config_dir' \n");
-        _exit(1);
-      }
+      fprintf(stderr,"unable to stat() config dir '%s': %d %d, %s\n",
+              cache_system_config_directory, ierr, errno, strerror(errno));
+      fprintf(stderr, "please set config path via 'proxy.config.config_dir' \n");
+      _exit(1);
     }
   }
 #ifdef HIT_EVACUATE

Modified: trafficserver/traffic/trunk/iocore/cache/CacheHosting.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/cache/CacheHosting.cc?rev=945730&r1=945729&r2=945730&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/cache/CacheHosting.cc (original)
+++ trafficserver/traffic/trunk/iocore/cache/CacheHosting.cc Tue May 18 16:12:16 2010
@@ -22,6 +22,7 @@
  */
 
 #include "P_Cache.h"
+#include "I_Layout.h"
 
 extern int gndisks;
 
@@ -205,9 +206,8 @@ CacheHostTable::CacheHostTable(Cache * c
   char *config_file = NULL;
   IOCORE_ReadConfigStringAlloc(config_file, "proxy.config.cache.hosting_filename");
   ink_release_assert(config_file != NULL);
-  ink_strncpy(config_file_path, cache_system_config_directory, sizeof(config_file_path));
-  strncat(config_file_path, DIR_SEP, (sizeof(config_file_path) - strlen(config_file_path) - 1));
-  strncat(config_file_path, config_file, (sizeof(config_file_path) - strlen(config_file_path) - 1));
+  Layout::relative_to(config_file_path, sizeof(config_file_path),
+                      cache_system_config_directory, config_file);
   xfree(config_file);
   hostMatch = NULL;
 
@@ -642,9 +642,8 @@ ConfigPartitions::read_config_file()
 
   IOCORE_ReadConfigStringAlloc(config_file, "proxy.config.cache.partition_filename");
   ink_release_assert(config_file != NULL);
-  ink_strncpy(config_file_path, cache_system_config_directory, sizeof(config_file_path));
-  strncat(config_file_path, DIR_SEP, (sizeof(config_file_path) - strlen(config_file_path) - 1));
-  strncat(config_file_path, config_file, (sizeof(config_file_path) - strlen(config_file_path) - 1));
+  Layout::relative_to(config_file_path, sizeof(config_file_path),
+                      cache_system_config_directory, config_file);
   xfree(config_file);
 
   file_buf = readIntoBuffer(config_file_path, "[CachePartition]", NULL);