summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--svc/init.go479
1 files changed, 0 insertions, 479 deletions
diff --git a/svc/init.go b/svc/init.go
index 9e4c418..5dc732c 100644
--- a/svc/init.go
+++ b/svc/init.go
@@ -1,21 +1,14 @@
 package svc // import "github.com/getwtxt/getwtxt/svc"
 
 import (
-	"database/sql"
-	"fmt"
 	"html/template"
 	"log"
 	"os"
 	"os/signal"
-	"path/filepath"
-	"strings"
 	"time"
 
-	"github.com/fsnotify/fsnotify"
 	"github.com/getwtxt/registry"
 	"github.com/spf13/pflag"
-	"github.com/spf13/viper"
-	"github.com/syndtr/goleveldb/leveldb"
 )
 
 const getwtxt = "0.3.0"
@@ -90,209 +83,6 @@ func checkFlags() {
 	}
 }
 
-func initConfig() {
-
-	if *flagConfFile == "" {
-		viper.SetConfigName("getwtxt")
-		viper.SetConfigType("yml")
-		viper.AddConfigPath(".")
-		viper.AddConfigPath("/usr/local/getwtxt")
-		viper.AddConfigPath("/etc")
-		viper.AddConfigPath("/usr/local/etc")
-
-	} else {
-		path, file := filepath.Split(*flagConfFile)
-		if path == "" {
-			path = "."
-		}
-		if file == "" {
-			file = *flagConfFile
-		}
-		filename := strings.Split(file, ".")
-		viper.SetConfigName(filename[0])
-		viper.SetConfigType(filename[1])
-		viper.AddConfigPath(path)
-	}
-
-	log.Printf("Loading configuration ...\n")
-	if err := viper.ReadInConfig(); err != nil {
-		log.Printf("%v\n", err.Error())
-		log.Printf("Using defaults ...\n")
-	} else {
-		viper.WatchConfig()
-		viper.OnConfigChange(func(e fsnotify.Event) {
-			log.Printf("Config file change detected. Reloading...\n")
-			rebindConfig()
-		})
-	}
-
-	viper.SetDefault("ListenPort", 9001)
-	viper.SetDefault("LogFile", "getwtxt.log")
-	viper.SetDefault("DatabasePath", "getwtxt.db")
-	viper.SetDefault("AssetsDirectory", "assets")
-	viper.SetDefault("DatabaseType", "leveldb")
-	viper.SetDefault("StdoutLogging", false)
-	viper.SetDefault("ReCacheInterval", "1h")
-	viper.SetDefault("DatabasePushInterval", "5m")
-
-	viper.SetDefault("Instance.SiteName", "getwtxt")
-	viper.SetDefault("Instance.OwnerName", "Anonymous Microblogger")
-	viper.SetDefault("Instance.Email", "nobody@knows")
-	viper.SetDefault("Instance.URL", "https://twtxt.example.com")
-	viper.SetDefault("Instance.Description", "A fast, resilient twtxt registry server written in Go!")
-
-	confObj.Mu.Lock()
-
-	confObj.Port = viper.GetInt("ListenPort")
-	confObj.LogFile = viper.GetString("LogFile")
-
-	if *flagDBType == "" {
-		confObj.DBType = strings.ToLower(viper.GetString("DatabaseType"))
-	} else {
-		confObj.DBType = *flagDBType
-	}
-
-	if *flagDBPath == "" {
-		confObj.DBPath = viper.GetString("DatabasePath")
-	} else {
-		confObj.DBPath = *flagDBPath
-	}
-	log.Printf("Using %v database: %v\n", confObj.DBType, confObj.DBPath)
-
-	if *flagAssets == "" {
-		confObj.AssetsDir = viper.GetString("AssetsDirectory")
-	} else {
-		confObj.AssetsDir = *flagAssets
-	}
-
-	confObj.StdoutLogging = viper.GetBool("StdoutLogging")
-	if confObj.StdoutLogging {
-		log.Printf("Logging to stdout\n")
-	} else {
-		log.Printf("Logging to %v\n", confObj.LogFile)
-	}
-
-	confObj.CacheInterval = viper.GetDuration("StatusFetchInterval")
-	log.Printf("User status fetch interval: %v\n", confObj.CacheInterval)
-
-	confObj.DBInterval = viper.GetDuration("DatabasePushInterval")
-	log.Printf("Database push interval: %v\n", confObj.DBInterval)
-
-	confObj.LastCache = time.Now()
-	confObj.LastPush = time.Now()
-	confObj.Version = getwtxt
-
-	confObj.Instance.Vers = getwtxt
-	confObj.Instance.Name = viper.GetString("Instance.SiteName")
-	confObj.Instance.URL = viper.GetString("Instance.URL")
-	confObj.Instance.Owner = viper.GetString("Instance.OwnerName")
-	confObj.Instance.Mail = viper.GetString("Instance.Email")
-	confObj.Instance.Desc = viper.GetString("Instance.Description")
-
-	confObj.Mu.Unlock()
-
-}
-
-func initLogging() {
-
-	confObj.Mu.RLock()
-
-	if confObj.StdoutLogging {
-		log.SetOutput(os.Stdout)
-
-	} else {
-
-		logfile, err := os.OpenFile(confObj.LogFile, os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0600)
-		if err != nil {
-			log.Printf("Could not open log file: %v\n", err.Error())
-		}
-
-		// Listen for the signal to close the log file
-		// in a separate thread. Passing it as an argument
-		// to prevent race conditions when the config is
-		// reloaded.
-		go func(logfile *os.File) {
-
-			<-closeLog
-			log.Printf("Closing log file ...\n")
-
-			err = logfile.Close()
-			if err != nil {
-				log.Printf("Couldn't close log file: %v\n", err.Error())
-			}
-		}(logfile)
-
-		log.SetOutput(logfile)
-	}
-
-	confObj.Mu.RUnlock()
-}
-
-func rebindConfig() {
-
-	confObj.Mu.RLock()
-	if !confObj.StdoutLogging {
-		closeLog <- true
-	}
-	confObj.Mu.RUnlock()
-
-	confObj.Mu.Lock()
-
-	confObj.LogFile = viper.GetString("LogFile")
-	confObj.DBType = strings.ToLower(viper.GetString("DatabaseType"))
-	confObj.DBPath = viper.GetString("DatabasePath")
-	confObj.StdoutLogging = viper.GetBool("StdoutLogging")
-	confObj.CacheInterval = viper.GetDuration("StatusFetchInterval")
-	confObj.DBInterval = viper.GetDuration("DatabasePushInterval")
-
-	confObj.Instance.Name = viper.GetString("Instance.SiteName")
-	confObj.Instance.URL = viper.GetString("Instance.URL")
-	confObj.Instance.Owner = viper.GetString("Instance.OwnerName")
-	confObj.Instance.Mail = viper.GetString("Instance.Email")
-	confObj.Instance.Desc = viper.GetString("Instance.Description")
-
-	confObj.Mu.Unlock()
-
-	initLogging()
-}
-
-func initTemplates() *template.Template {
-	confObj.Mu.RLock()
-	assetsDir := confObj.AssetsDir
-	confObj.Mu.RUnlock()
-
-	return template.Must(template.ParseFiles(assetsDir + "/tmpl/index.html"))
-}
-
-// Pull DB data into cache, if available.
-func initDatabase() {
-	var db dbase
-	var err error
-
-	confObj.Mu.RLock()
-	switch confObj.DBType {
-
-	case "leveldb":
-		var lvl *leveldb.DB
-		lvl, err = leveldb.OpenFile(confObj.DBPath, nil)
-		db = &dbLevel{db: lvl}
-
-	case "sqlite":
-		var lite *sql.DB
-		db = &dbSqlite{db: lite}
-
-	}
-	confObj.Mu.RUnlock()
-
-	if err != nil {
-		log.Fatalf("%v\n", err.Error())
-	}
-
-	dbChan <- db
-
-	pullDatabase()
-}
-
 // Watch for SIGINT aka ^C
 // Close the log file then exit
 func watchForInterrupt() {
@@ -332,272 +122,3 @@ func watchForInterrupt() {
 		}
 	}()
 }
-
-func titleScreen() {
-	fmt.Printf(`
-    
-                       _            _        _
-             __ _  ___| |___      _| |___  _| |_
-            / _  |/ _ \ __\ \ /\ / / __\ \/ / __|
-           | (_| |  __/ |_ \ V  V /| |_ >  <| |_
-            \__, |\___|\__| \_/\_/  \__/_/\_\\__|
-            |___/
-                       version ` + getwtxt + `
-                 github.com/getwtxt/getwtxt
-                          GPL  v3  
-
-`)
-}
-
-func helpScreen() {
-	fmt.Printf(`
-                        getwtxt Help
-
-
-                 :: Command Line Options ::
-
-    Command line options are used to explicitly override defaults,
- or what has been specified in the configuration file.
-
-    -h [--help]      Print this help screen.
-    -m [--manual]    Print the manual.
-    -v [--version]   Print the version information and quit.
-    -c [--config]    Path to an alternate configuration file
-                       to use. May be relative or absolute.
-    -a [--assets]    Path to the assets directory, containing
-                       style.css and tmpl/index.html
-    -d [--db]        Path getwtxt should use for the database.
-    -t [--dbtype]    Type of database to use.
-                       Options: leveldb
-
-`)
-}
-func manualScreen() {
-	fmt.Printf(`
-                       :: Sections ::
-
-    >> Configuration File
-        Covers syntax and location of default configuration,
-        passing a specific configuration file to getwtxt, 
-        and acceptable formats for configuration files.
-
-    >> Customizing the Landing Page
-        Covers the location of the landing page template,
-        format of the template, and optional preprocessor
-        tags available to use when creating a new landing
-        page template.
-
-    >> Interacting With the Registry
-        Explains all API endpoints, their parameters,
-        and expected output.
-
-
-                  :: Configuration File ::
-
-    The default configuration file is in YAML format, chosen for
- its clarity and its support of commenting (unlike JSON). It may
- be placed in any of the following locations by default:
-
-    The same directory as the getwtxt executable
-    /usr/local/getwtxt/
-    /etc/
-    /usr/local/etc/
-
-    The paths are searched in that order. The first configuration
- file found is used by getwtxt, while the locations further down
- are ignored.
-    
-    Multiple configuration files may be used, however, with the
- '-c' command line flag. The path passed to getwtxt via '-c' may
- be relative or absolute. For example, both of the following are
- allowed:
-
-    ./getwtxt -c myconfig.json
-    ./getwtxt -c /etc/ExtraConfigsDir/mysecondconfig.toml
-
- The supported configuration types are:
-    YAML, TOML, JSON, HCL
-
-    The configuration file contains several options used to
- customize your instance of getwtxt. None are required, they will 
- simply use their default value unless otherwise specified.
-
-    ListenPort: Defines the port getwtxt should bind to.
-        Default: 9001
-
-    DatabaseType: The type of back-end getwtxt should use
-        to store registry data. Currently, only leveldb
-        is available, with more options in development.
-        Default: leveldb
-
-    DatabasePath: The location of the LevelDB structure
-        used by getwtxt to back up registry data. This
-        can be a relative or absolute path.
-        Default: getwtxt.db
-
-    AssetsDirectory: This is the directory where getwtxt
-        can find style.css and tmpl/index.html -- the
-        stylesheet for the landing page and the landing
-        page template, respectively.
-        Default: assets
-
-    StdoutLogging: Boolean used to determine whether
-        getwtxt should send logging output to stdout.
-        This is useful for debugging, but you should
-        probably save your logs once your instance 
-        is running.
-        Default: false
-
-    LogFile: The location of getwtxt's log file. This,
-        like DatabasePath, can be relative or absolute.
-        Default: getwtxt.log
-
-    DatabasePushInterval: The interval on which getwtxt
-        will push registry data from the in-memory cache
-        to the on-disk LevelDB database. The following
-        time suffixes may be used:
-            ns, us, ms, s, m, h
-        Default: 5m
-
-    StatusFetchInterval: The interval on which getwtxt
-        will crawl all users' twtxt files to retrieve
-        new statuses. The same time suffixes as
-        DatabasePushInterval may be used.
-        Default: 1h
-
-    Instance: Signifies the start of instance-specific
-        meta information. The following are used only
-        for the summary and use information displayed
-        by the default web page for getwtxt. If desired,
-        the assets/tmpl/index.html file may be
-        customized. Keep in mind that in YAML, the
-        following options must be preceded by two spaces
-        so that they are interpreted as sub-options.
-
-    SiteName: The name of your getwtxt instance.
-        Default: getwtxt
-
-    URL: The publicly-accessible URL of your 
-        getwtxt instance.
-        Default: https://twtxt.example.com
-
-    OwnerName: Your name.
-        Default: Anonymous Microblogger 
-
-    Email: Your email address.
-        Default: nobody@knows
-
-    Description: A short description of your getwtxt
-        instance or your site. As this likely includes
-        whitespace, it should be in double-quotes.
-        This can include XHTML or HTML line breaks if 
-        desired: 
-            <br />
-            <br>
-        Default: "A fast, resilient twtxt registry
-            server written in Go!"
-
-
-             :: Customizing the Landing Page ::
-
-    If you like, feel free to customize the landing page
- template provided at 
-
-        assets/tmpl/index.html
-
-    It must be standard HTML or XHTML. There are a few special 
- tags available to use that will be replaced with specific values 
- when the template is parsed by getwtxt.
-
-    Values are derived from the "Instance" section of the 
- configuration file, except for the version of getwtxt used. The 
- following will be in the form of:
-    
-    {{.TemplateTag}} What it will be replaced with when
-        the template is processed and the landing page is
-        served to a visitor.
-
-    The surrounding double braces and prefixed period are required 
- if you choose to use these tags in your modified landing page. The
- tags themselves are not required; access to them is provided simply
- for convenience.
-
-    {{.Vers}} The version of getwtxt used. Does not include
-        the preceding 'v'. Ex: 0.2.0
-
-    {{.Name}} The name of the instance.
-
-    {{.Owner}} The instance owner's name.
-
-    {{.Mail}} Email address used for contacting the instance
-        owner if the need arises.
-
-    {{.Desc}} Short description placed in the configuration
-        file. This is why HTML tags are allowed.
-
-    {{.URL}} The publicly-accessible URL of your instance. In
-        the default landing page, example API calls are shown
-        using this URL for the convenience of the user.
-
-
-              :: Interacting with the Registry ::
-
-    The registry API is rather simple, and can be interacted with
- via the command line using cURL. Example output of the calls will
- not be provided. 
-
-    Pseudo line-breaks will be represented with a backslash. 
- Examples with line-breaks are not syntactically correct and will
- be rejected by cURL. Please concatenate the example calls without 
- the backslash. This is only present to maintain consistent 
- formatting for this manual text.
-
-    Ex: 
-        /api/plain/users\
-        ?q=FOO
-    Should be: 
-        /api/plain/users?q=FOO
-
-    All queries (every call except adding users) accept the
- ?page=N parameter, where N > 0. The output is provided in groups 
- of 20 results. For example, indexed at 1, ?page=2 (or &page=2 if 
- it is not the first parameter) appended to any query will return 
- results 21 through 40. If the page requested will exceed the 
- bounds of the query output, the last 20 query results are returned.
-
- Adding a user:
-    curl -X POST 'http://localhost:9001/api/plain/users\
-        ?url=https://gbmor.dev/twtxt.txt&nickname=gbmor'
-
- Retrieve user list:
-    curl 'http://localhost:9001/api/plain/users'
-
- Retrieve all statuses:
-    curl 'http://localhost:9001/api/plain/tweets'
-
- Retrieve all statuses with mentions:
-    curl 'http://localhost:9001/api/plain/mentions'
-
- Retrieve all statuses with tags:
-    curl 'http://localhost:9001/api/plain/tags'
-
- Query for users by keyword:
-    curl 'http://localhost:9001/api/plain/users?q=FOO'
-
- Query for users by URL:
-    curl 'http://localhost:9001/api/plain/users\
-        ?url=https://gbmor.dev/twtxt.txt'
-
- Query for statuses by substring:
-    curl 'http://localhost:9001/api/plain/tweets\
-        ?q=SUBSTRING'
-
- Query for statuses mentioning a user:
-    curl 'http://localhost:9001/api/plain/mentions\
-        ?url=https://gbmor.dev/twtxt.txt'
-
- Query for statuses with a given tag:
-    curl 'http://localhost:9001/api/plain/tags/myTagHere'
-
-`)
-}
9 16:17:07 -0700 committer Kartik K. Agaram <vc@akkartik.com> 2016-05-19 16:17:07 -0700 2981 - sandbox buttons implemented in edit/' href='/akkartik/mu/commit/edit/006-sandbox-copy.mu?h=hlt&id=09b8717b2bd253b5dee7df34ef1db93d27b93dd4'>09b8717b ^
294b2ab3 ^
09b8717b ^


294b2ab3 ^

898f03cc ^
294b2ab3 ^

ceeb92d4 ^
71056d61 ^
09b8717b ^





3d8b137c ^
09b8717b ^


4e7186fa ^
09b8717b ^
ada5eb55 ^
09b8717b ^



2d91279b ^
09b8717b ^
4a48bedc ^
09b8717b ^
3d8b137c ^
dd660682 ^
09b8717b ^
2d91279b ^
09b8717b ^
3d8b137c ^

898f03cc ^
3d8b137c ^
dd660682 ^
09b8717b ^
2d91279b ^
09b8717b ^


2d91279b ^
09b8717b ^
4a48bedc ^
09b8717b ^
2d91279b ^
dd660682 ^

ea19d0dc ^
2d91279b ^
09b8717b ^



dd660682 ^
09b8717b ^

2d91279b ^
09b8717b ^
4a48bedc ^
2d91279b ^
09b8717b ^
9c2421ec ^
3d8b137c ^

09b8717b ^



01ce563d ^
09b8717b ^

2d91279b ^
09b8717b ^
4a48bedc ^
2d91279b ^
3d8b137c ^

dd660682 ^
2d91279b ^
dd660682 ^
3d8b137c ^
09b8717b ^


2d91279b ^
09b8717b ^
4a48bedc ^
3d8b137c ^

09b8717b ^


3d8b137c ^
09b8717b ^
4a48bedc ^
3d8b137c ^

09b8717b ^



6f65d591 ^
09b8717b ^

294b2ab3 ^



6d12a8c4 ^
09b8717b ^
09b8717b ^


294b2ab3 ^
09b8717b ^

71056d61 ^
294b2ab3 ^
898f03cc ^
294b2ab3 ^

ceeb92d4 ^
71056d61 ^
09b8717b ^







294b2ab3 ^
09b8717b ^



71056d61 ^
294b2ab3 ^
898f03cc ^
294b2ab3 ^

ceeb92d4 ^
71056d61 ^
09b8717b ^





294b2ab3 ^
09b8717b ^


71056d61 ^
294b2ab3 ^
898f03cc ^
294b2ab3 ^

ceeb92d4 ^
71056d61 ^
09b8717b ^

898f03cc ^










6d12a8c4 ^
898f03cc ^


























































dd660682 ^
898f03cc ^








4a48bedc ^
898f03cc ^

dd660682 ^
898f03cc ^










4a48bedc ^
898f03cc ^
dd660682 ^
898f03cc ^









ec7c8c8b ^



dd660682 ^
898f03cc ^
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395