@@ -96,7 +96,23 @@ const (
9696 errShutdownDisposition = generic .ConstError ("invalid shutdown disposition" )
9797)
9898
99+ // Daemon constructs the command which
100+ // hosts the file system service server.
101+ func Daemon () command.Command {
102+ const (
103+ name = daemonCommandName
104+ synopsis = "Host system services."
105+ )
106+ usage := header ("File system service daemon." ) +
107+ "\n \n " + synopsis
108+ return command .MakeVariadicCommand [daemonOptions ](
109+ name , synopsis , usage , daemonExecute ,
110+ command .WithSubcommands (Service ()),
111+ )
112+ }
113+
99114func (do * daemonOptions ) BindFlags (flagSet * flag.FlagSet ) {
115+ bindDaemonFlags (flagSet , do )
100116 userMaddrs , err := userServiceMaddrs ()
101117 if err != nil {
102118 panic (err )
@@ -118,9 +134,12 @@ func (do *daemonOptions) BindFlags(flagSet *flag.FlagSet) {
118134 }
119135 return nil
120136 })
137+ }
138+
139+ func bindDaemonFlags (flagSet * flag.FlagSet , options * daemonOptions ) {
121140 const serverUsage = "listening socket `maddr`" +
122141 "\n can be specified multiple times and/or comma separated"
123- flagSetFunc (flagSet , serverFlagName , serverUsage , do ,
142+ flagSetFunc (flagSet , serverFlagName , serverUsage , options ,
124143 func (value []multiaddr.Multiaddr , settings * daemonSettings ) error {
125144 settings .serverMaddrs = append (settings .serverMaddrs , value ... )
126145 return nil
@@ -129,7 +148,7 @@ func (do *daemonOptions) BindFlags(flagSet *flag.FlagSet) {
129148 exitName = exitAfterFlagName
130149 exitUsage = "check every `interval` (e.g. \" 30s\" ) and shutdown the daemon if its idle"
131150 )
132- flagSetFunc (flagSet , exitName , exitUsage , do ,
151+ flagSetFunc (flagSet , exitName , exitUsage , options ,
133152 func (value time.Duration , settings * daemonSettings ) error {
134153 settings .exitInterval = value
135154 return nil
@@ -138,7 +157,7 @@ func (do *daemonOptions) BindFlags(flagSet *flag.FlagSet) {
138157 uidName = apiFlagPrefix + "uid"
139158 uidUsage = "file owner's `uid`"
140159 )
141- flagSetFunc (flagSet , uidName , uidUsage , do ,
160+ flagSetFunc (flagSet , uidName , uidUsage , options ,
142161 func (value p9.UID , settings * daemonSettings ) error {
143162 settings .nineIDs .uid = value
144163 return nil
@@ -149,7 +168,7 @@ func (do *daemonOptions) BindFlags(flagSet *flag.FlagSet) {
149168 gidName = apiFlagPrefix + "gid"
150169 gidUsage = "file owner's `gid`"
151170 )
152- flagSetFunc (flagSet , gidName , gidUsage , do ,
171+ flagSetFunc (flagSet , gidName , gidUsage , options ,
153172 func (value p9.GID , settings * daemonSettings ) error {
154173 settings .nineIDs .gid = value
155174 return nil
@@ -161,7 +180,7 @@ func (do *daemonOptions) BindFlags(flagSet *flag.FlagSet) {
161180 permissionsUsage = "`permissions` to use when creating service files"
162181 )
163182 apiPermissions := fs .FileMode (apiPermissionsDefault )
164- flagSetFunc (flagSet , permissionsName , permissionsUsage , do ,
183+ flagSetFunc (flagSet , permissionsName , permissionsUsage , options ,
165184 func (value string , settings * daemonSettings ) error {
166185 permissions , err := parsePOSIXPermissions (apiPermissions , value )
167186 if err != nil {
@@ -176,13 +195,7 @@ func (do *daemonOptions) BindFlags(flagSet *flag.FlagSet) {
176195}
177196
178197func (do daemonOptions ) make () (daemonSettings , error ) {
179- settings := daemonSettings {
180- nineIDs : nineIDs {
181- uid : apiUIDDefault ,
182- gid : apiGIDDefault ,
183- },
184- permissions : apiPermissionsDefault ,
185- }
198+ settings := makeDaemonSettings ()
186199 if err := generic .ApplyOptions (& settings , do ... ); err != nil {
187200 return daemonSettings {}, err
188201 }
@@ -199,26 +212,28 @@ func (do daemonOptions) make() (daemonSettings, error) {
199212 return settings , nil
200213}
201214
202- // Daemon constructs the command which
203- // hosts the file system service server.
204- func Daemon () command.Command {
205- const (
206- name = daemonCommandName
207- synopsis = "Host system services."
208- )
209- usage := header ("File system service daemon." ) +
210- "\n \n " + synopsis
211- return command .MakeVariadicCommand [daemonOptions ](name , synopsis , usage , daemonExecute )
215+ func makeDaemonSettings () daemonSettings {
216+ return daemonSettings {
217+ nineIDs : nineIDs {
218+ uid : apiUIDDefault ,
219+ gid : apiGIDDefault ,
220+ },
221+ permissions : apiPermissionsDefault ,
222+ }
212223}
213224
214225func daemonExecute (ctx context.Context , options ... daemonOption ) error {
215226 settings , err := daemonOptions (options ).make ()
216227 if err != nil {
217228 return err
218229 }
230+ return daemonRun (ctx , & settings )
231+ }
232+
233+ func daemonRun (ctx context.Context , settings * daemonSettings ) error {
219234 dCtx , cancel := context .WithCancel (ctx )
220235 defer cancel ()
221- system , err := newSystem (dCtx , & settings )
236+ system , err := newSystem (dCtx , settings )
222237 if err != nil {
223238 return err
224239 }
0 commit comments