vbatts/cri-o
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #647 from mrunalp/rename_to_crio

Browse source 
Rename remnants of ocid to crio
This commit is contained in:
Antonio Murdaca 2017-07-12 12:38:28 +02:00 committed by GitHub
commit f7206aa86d
2 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
server/config.go
View file

@ -172,7 +172,7 @@ type NetworkConfig struct {
// TOML-friendly (it has all of the explicit tables). It's just used for // TOML-friendly (it has all of the explicit tables). It's just used for
// conversions. // conversions.
type tomlConfig struct { type tomlConfig struct {
Ocid struct { Crio struct {
RootConfig RootConfig
API struct{ APIConfig } `toml:"api"` API struct{ APIConfig } `toml:"api"`
Runtime struct{ RuntimeConfig } `toml:"runtime"` Runtime struct{ RuntimeConfig } `toml:"runtime"`
@ -182,19 +182,19 @@ type tomlConfig struct {
} }
func (t *tomlConfig) toConfig(c *Config) { func (t *tomlConfig) toConfig(c *Config) {
c.RootConfig = t.Ocid.RootConfig c.RootConfig = t.Crio.RootConfig
c.APIConfig = t.Ocid.API.APIConfig c.APIConfig = t.Crio.API.APIConfig
c.RuntimeConfig = t.Ocid.Runtime.RuntimeConfig c.RuntimeConfig = t.Crio.Runtime.RuntimeConfig
c.ImageConfig = t.Ocid.Image.ImageConfig c.ImageConfig = t.Crio.Image.ImageConfig
c.NetworkConfig = t.Ocid.Network.NetworkConfig c.NetworkConfig = t.Crio.Network.NetworkConfig
} }
func (t *tomlConfig) fromConfig(c *Config) { func (t *tomlConfig) fromConfig(c *Config) {
t.Ocid.RootConfig = c.RootConfig t.Crio.RootConfig = c.RootConfig
t.Ocid.API.APIConfig = c.APIConfig t.Crio.API.APIConfig = c.APIConfig
t.Ocid.Runtime.RuntimeConfig = c.RuntimeConfig t.Crio.Runtime.RuntimeConfig = c.RuntimeConfig
t.Ocid.Image.ImageConfig = c.ImageConfig t.Crio.Image.ImageConfig = c.ImageConfig
t.Ocid.Network.NetworkConfig = c.NetworkConfig t.Crio.Network.NetworkConfig = c.NetworkConfig
} }
// FromFile populates the Config from the TOML-encoded file at the given path. // FromFile populates the Config from the TOML-encoded file at the given path.

4
server/server.go
View file

@ -536,10 +536,10 @@ func (s *Server) cleanupSandboxesOnShutdown() {
// Shutdown attempts to shut down the server's storage cleanly // Shutdown attempts to shut down the server's storage cleanly
func (s *Server) Shutdown() error { func (s *Server) Shutdown() error {
// why do this on clean shutdown! we want containers left running when ocid // why do this on clean shutdown! we want containers left running when crio
// is down for whatever reason no?! // is down for whatever reason no?!
// notice this won't trigger just on system halt but also on normal // notice this won't trigger just on system halt but also on normal
// ocid.service restart!!! // crio.service restart!!!
s.cleanupSandboxesOnShutdown() s.cleanupSandboxesOnShutdown()
_, err := s.store.Shutdown(false) _, err := s.store.Shutdown(false)
return err return err