Changeset - 97637c8d1d40
Parent rev.
Child rev.
[Not reviewed]
0 2 0
Jan Kaluza - 13 years ago 2013-01-17 08:59:07
hanzz.k@gmail.com
pass boost::filesystem::path to createDirectories
2 files changed with 8 insertions and 5 deletions:
CMakeLists.txt
4
4
spectrum/src/main.cpp
4
1
0 comments (0 inline, 0 general)
CMakeLists.txt
➞
Show inline comments
 
@@ -193,52 +193,52 @@ endif()
 
if (CMAKE_COMPILER_IS_GNUCXX)
 
set(openssl_DIR "${CMAKE_SOURCE_DIR}/cmake_modules")
 
find_package(openssl)
 
endif()
 

			




	
	
	
		
 
if(ENABLE_IRC)

			




	
	
	
		
 
	set(Communi_DIR "${CMAKE_SOURCE_DIR}/cmake_modules")

			




	
	
	
		
 
	find_package(Communi)

			




	
	
	
		
 

			




	
	
	
		
 
	INCLUDE(FindQt4)

			




	
	
	
		
 
	FIND_PACKAGE(Qt4 COMPONENTS QtCore QtNetwork)

			




	
	
	
		
 
	# ADD_DEFINITIONS(${SWIFTEN_CFLAGS})

			




	
	
	
		
 
	ADD_DEFINITIONS(-DSUPPORT_LEGACY_CAPS)

			




	
	
	
		
 
	# ADD_DEFINITIONS(-DBOOST_FILESYSTEM_VERSION=2)

			




	
	
	
		
 
endif()

			




	
	
	
		
 

			




	
	
	
		
 
set(event_DIR "${CMAKE_SOURCE_DIR}/cmake_modules")

			




	
	
	
		
 
find_package(event)

			




	
	
	
		
 

			




	
	
	
		
 
if (NOT WIN32 AND ENABLE_SKYPE)

			




	
	
	
		
 
set(dbus_DIR "${CMAKE_SOURCE_DIR}/cmake_modules")

			




	
	
	
		
 
find_package(dbus)

			




	
	
	
		
 
endif()

			




	
	
	
		
 

			




	
	
	
		
 
if(ENABLE_YAHOO2)

			




	
	
	
		
 
	set(yahoo2_DIR "${CMAKE_SOURCE_DIR}/cmake_modules")

			




	
	
	
		
 
	find_package(yahoo2)

			




	
	
	
		
 
endif()

			




	
	
	
		
 
# if(ENABLE_YAHOO2)

			




	
	
	
		
 
# 	set(yahoo2_DIR "${CMAKE_SOURCE_DIR}/cmake_modules")

			




	
	
	
		
 
# 	find_package(yahoo2)

			




	
	
	
		
 
# endif()

			




	
	
	
		
 

			




	
	
	
		
 
####### Miscallanous ######

			




	
	
	
		
 

			




	
	
	
		
 
if(ENABLE_DOCS)

			




	
	
	
		
 
	find_package(Doxygen)

			




	
	
	
		
 
endif()

			




	
	
	
		
 

			




	
	
	
		
 
if(ENABLE_LOG)

			




	
	
	
		
 
	if(LOG4CXX_INCLUDE_DIR AND LOG4CXX_LIBRARY)

			




	
	
	
		
 
		set(LOG4CXX_LIBRARIES ${LOG4CXX_LIBRARY})

			




	
	
	
		
 
		set(LOG4CXX_FOUND 1)

			




	
	
	
		
 
		message(STATUS "Using log4cxx: ${CPPUNIT_INCLUDE_DIR} ${LOG4CXX_INCLUDE_DIR}")

			




	
	
	
		
 
	else()

			




	
	
	
		
 
		set(log4cxx_DIR "${CMAKE_SOURCE_DIR}/cmake_modules")

			




	
	
	
		
 
		find_package(log4cxx)

			




	
	
	
		
 
	endif()

			




	
	
	
		
 
endif()

			




	
	
	
		
 

			




	
	
	
		
 
# FIND CPPUNIT

			




	
	
	
		
 
if(ENABLE_TESTS)

			




	
	
	
		
 
	set(cppunit_DIR "${CMAKE_SOURCE_DIR}/cmake_modules")

			




	
	
	
		
 
	find_package(cppunit)

			




	
	
	
		
 

			




	
	
	
		
 
	if(NOT CPPUNIT_FOUND AND CPPUNIT_INCLUDE_DIR AND CPPUNIT_LIBRARY)

			




        

    


    
    

    

        

                

                    spectrum/src/main.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -195,48 +195,51 @@ int mainloop() {

			




	
	
	
		
 
			return -2;

			




	
	
	
		
 
		}

			




	
	
	
		
 
	}

			




	
	
	
		
 
	else if (!storageBackend->connect()) {

			




	
	
	
		
 
		std::cerr << "Can't connect to database. Check the log to find out the reason.\n";

			




	
	
	
		
 
		return -1;

			




	
	
	
		
 
	}

			




	
	
	
		
 

			




	
	
	
		
 
	Logging::redirect_stderr();

			




	
	
	
		
 

			




	
	
	
		
 
	DiscoItemsResponder discoItemsResponder(&transport);

			




	
	
	
		
 
	discoItemsResponder.start();

			




	
	
	
		
 

			




	
	
	
		
 
	UserManager userManager(&transport, &userRegistry, &discoItemsResponder, storageBackend);

			




	
	
	
		
 
	userManager_ = &userManager;

			




	
	
	
		
 

			




	
	
	
		
 
	UserRegistration *userRegistration = NULL;

			




	
	
	
		
 
	UsersReconnecter *usersReconnecter = NULL;

			




	
	
	
		
 
	if (storageBackend) {

			




	
	
	
		
 
		userRegistration = new UserRegistration(&transport, &userManager, storageBackend);

			




	
	
	
		
 
		userRegistration->start();

			




	
	
	
		
 

			




	
	
	
		
 
		usersReconnecter = new UsersReconnecter(&transport, storageBackend);

			




	
	
	
		
 
	}

			




	
	
	
		
 
	else if (!CONFIG_BOOL(config_, "service.server_mode")) {

			




	
	
	
		
 
		LOG4CXX_WARN(logger, "Registrations won't work, you have specified [database] type=none in config file.");

			




	
	
	
		
 
	}

			




	
	
	
		
 

			




	
	
	
		
 
	FileTransferManager ftManager(&transport, &userManager);

			




	
	
	
		
 

			




	
	
	
		
 
	NetworkPluginServer plugin(&transport, config_, &userManager, &ftManager, &discoItemsResponder);

			




	
	
	
		
 
	plugin.start();

			




	
	
	
		
 

			




	
	
	
		
 
	AdminInterface adminInterface(&transport, &userManager, &plugin, storageBackend, userRegistration);

			




	
	
	
		
 
	plugin.setAdminInterface(&adminInterface);

			




	
	
	
		
 

			




	
	
	
		
 
	StatsResponder statsResponder(&transport, &userManager, &plugin, storageBackend);

			




	
	
	
		
 
	statsResponder.start();

			




	
	
	
		
 

			




	
	
	
		
 
	GatewayResponder gatewayResponder(transport.getIQRouter(), &userManager);

			




	
	
	
		
 
	gatewayResponder.start();

			




	
	
	
		
 

			




	
	
	
		
 
	AdHocManager adhocmanager(&transport, &discoItemsResponder, &userManager, storageBackend);

			




	
	
	
		
 
	adhocmanager.start();

			




	
	
	
		
 

			




	
	
	
		
 
	SettingsAdHocCommandFactory settings;

			




	
	
	
		
 
	adhocmanager.addAdHocCommand(&settings);

			




	
	
	
		
 

			




	
	
	
		
 
	eventLoop_ = &eventLoop;

			




	
	
	
		
 

			




	
	
	
		
 
	eventLoop.run();

			




	
	
		
 
@@ -376,49 +379,49 @@ int main(int argc, char **argv)

			




	
	
	
		
 
				std::cout << "Service not installed: " << uninstall_service_name << std::endl;

			




	
	
	
		
 
				return 1;

			




	
	
	
		
 
			}

			




	
	
	
		
 
		}		

			




	
	
	
		
 
#endif

			




	
	
	
		
 
	}

			




	
	
	
		
 
	catch (std::runtime_error& e)

			




	
	
	
		
 
	{

			




	
	
	
		
 
		std::cout << desc << "\n";

			




	
	
	
		
 
		return 1;

			




	
	
	
		
 
	}

			




	
	
	
		
 
	catch (...)

			




	
	
	
		
 
	{

			




	
	
	
		
 
		std::cout << desc << "\n";

			




	
	
	
		
 
		return 1;

			




	
	
	
		
 
	}

			




	
	
	
		
 

			




	
	
	
		
 
	if (!config.load(vm["config"].as<std::string>(), jid)) {

			




	
	
	
		
 
		std::cerr << "Can't load configuration file.\n";

			




	
	
	
		
 
		return 1;

			




	
	
	
		
 
	}

			




	
	
	
		
 

			




	
	
	
		
 
	// create directories

			




	
	
	
		
 
	try {

			




	
	
	
		
 
		Transport::Util::createDirectories(&config, CONFIG_STRING(&config, "service.working_dir"));

			




	
	
	
		
 
		Transport::Util::createDirectories(&config, boost::filesystem::path(CONFIG_STRING(&config, "service.working_dir")));

			




	
	
	
		
 
	}

			




	
	
	
		
 
	catch (...) {

			




	
	
	
		
 
		std::cerr << "Can't create service.working_dir directory " << CONFIG_STRING(&config, "service.working_dir") << ".\n";

			




	
	
	
		
 
		return 1;

			




	
	
	
		
 
	}

			




	
	
	
		
 
#ifndef WIN32

			




	
	
	
		
 
	// create directories

			




	
	
	
		
 
	try {

			




	
	
	
		
 
		boost::filesystem::create_directories(

			




	
	
	
		
 
			boost::filesystem::path(CONFIG_STRING(&config, "service.pidfile")).parent_path().string()

			




	
	
	
		
 
		);

			




	
	
	
		
 
	}

			




	
	
	
		
 
	catch (...) {

			




	
	
	
		
 
		std::cerr << "Can't create service.pidfile directory " << boost::filesystem::path(CONFIG_STRING(&config, "service.pidfile")).parent_path().string() << ".\n";

			




	
	
	
		
 
		return 1;

			




	
	
	
		
 
	}

			




	
	
	
		
 
	// create directories

			




	
	
	
		
 
	try {

			




	
	
	
		
 
		boost::filesystem::create_directories(

			




	
	
	
		
 
			boost::filesystem::path(CONFIG_STRING(&config, "service.portfile")).parent_path().string()

			




	
	
	
		
 
		);

			




	
	
	
		
 
	}

			




	
	
	
		
 
	catch (...) {

			




	
	
	
		
 
		std::cerr << "Can't create service.portfile directory " << CONFIG_STRING(&config, "service.portfile") << ".\n";

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        Server instance: srv01-10621
    
    
        This site is powered by
            Kallithea,
        which is
        © 2010–2021 by various authors & licensed under GPLv3.
            – Support