Revision 80dcae51 include/Nebula.h

View differences:

include/Nebula.h
244 244
    };
245 245

  
246 246
    /**
247
     *  Returns the default vms location. When ONE_LOCATION is defined this path
248
     *  points to $ONE_LOCATION/var/vms, otherwise it is /var/lib/one/vms. This
249
     *  location stores vm related files: deployment, transfer, context, and
250
     *  logs (in self-contained mode only)
251
     *      @return the vms location.
252
     */
253
    const string& get_vms_location()
254
    {
255
        return vms_location;
256
    };
257

  
258
    /**
247 259
     *  Returns the path of the log file for a VM, depending where OpenNebula is
248 260
     *  installed,
249 261
     *     $ONE_LOCATION/var/$VM_ID/vm.log
......
261 273
    	}
262 274
    	else
263 275
    	{
264
    		oss << nebula_location << "var/" << oid << "/vm.log";
276
    		oss << vms_location << oid << "/vm.log";
265 277
    	}
266 278

  
267 279
    	return oss.str();
......
315 327
            var_location     = "/var/lib/one/";
316 328
            remotes_location = "/var/lib/one/remotes/";
317 329
            ds_location      = "/var/lib/one/datastores/";
330
            vms_location     = "/var/lib/one/vms/";
318 331
        }
319 332
        else
320 333
        {
......
331 344
            var_location     = nebula_location + "var/";
332 345
            remotes_location = nebula_location + "var/remotes/";
333 346
            ds_location      = nebula_location + "var/datastores/";
347
            vms_location     = nebula_location + "var/vms/";
334 348
        }
335 349
    };
336 350

  
......
380 394
        {
381 395
            delete clpool;
382 396
        }
383
        
397

  
384 398
        if ( docpool != 0)
385 399
        {
386 400
            delete docpool;
......
464 478
    string  hook_location;
465 479
    string  remotes_location;
466 480
    string  ds_location;
481
    string  vms_location;
467 482

  
468 483
    string	hostname;
469 484

  

Also available in: Unified diff