should be more encapsulated (abstracted)

[core.git] / inc / classes / main / console / class_ConsoleTools.php

diff --git a/inc/classes/main/console/class_ConsoleTools.php b/inc/classes/main/console/class_ConsoleTools.php
index 876f61ca68d638a7bd2e99fa2871619d413ff6e5..cce0765df47d0032d3d9f12dbc3e9bf13b49aaaa 100644 (file)
--- a/inc/classes/main/console/class_ConsoleTools.php
+++ b/inc/classes/main/console/class_ConsoleTools.php
@@ -38,6 +38,7 @@ class ConsoleTools extends BaseFrameworkSystem {
         *
         * @param       $hostname       Host name we shall resolve
         * @return      $ip                     IP address resolved from host name
         *
         * @param       $hostname       Host name we shall resolve
         * @return      $ip                     IP address resolved from host name

+        * @todo        We should connect this to a caching class to cache DNS requests

         */
        protected function resolveIpAddress ($hostname) {
                // Debug message
         */
        protected function resolveIpAddress ($hostname) {
                // Debug message


@@ -50,6 +51,7 @@ class ConsoleTools extends BaseFrameworkSystem {
                $ip = '0.0.0.0';
 
                // Resolve it
                $ip = '0.0.0.0';
 
                // Resolve it

+               // @TODO Here should the cacher be implemented

                $ipResolved = gethostbyname($hostname);
 
                // Was it fine?
                $ipResolved = gethostbyname($hostname);
 
                // Was it fine?


@@ -62,16 +64,23 @@ class ConsoleTools extends BaseFrameworkSystem {
                                $this->__toString(),
                                $ip
                        ));
                                $this->__toString(),
                                $ip
                        ));

-               } // END - if
+               } else {
+                       // Problem while resolving IP address
+                       $this->debugOutput(sprintf("[%s:] Problem resolving IP address for host <span class=\"data\">%s</span>. Please check your /etc/hosts file.",
+                               $this->__toString(),
+                               $hostname
+                       ));
+               }

 
                // Return resolved IP
                return $ip;
        }
 
        /**
 
                // Return resolved IP
                return $ip;
        }
 
        /**

-        * Aquires the IP address of this host by reading the /etc/hostname file and solving it
+        * Aquires the IP address of this host by reading the /etc/hostname file
+        * and solving it. It is now stored in configuration

         *
         *

-        * @return      $ip             The resolved IP address
+        * @return      void

         */
        public static function acquireSelfIPAddress () {
                // Local IP by default
         */
        public static function acquireSelfIPAddress () {
                // Local IP by default


@@ -113,8 +122,8 @@ class ConsoleTools extends BaseFrameworkSystem {
                        ));
                }
 
                        ));
                }
 

-               // Return the IP address
-               return $ip;
+               // Set it in configuration
+               FrameworkConfiguration::getInstance()->setServerAddress($ip);

        }
 
        /**
        }
 
        /**